Cleaned up a lot
Lots o' cleaning and bug fixes