fixing some inconsistencies