Fixed a lot of inconsitency and retarded stuff