Fixed a bunch of inconsistencies...