fixed few inconsistencies after internal review