Fixed a lot of inconsistencies