fixing more inconsistencies