fixed various inconsistencies