Most inconsistencies fixed ?_?