Fixed a lot of problems!