Fixed a lot of stuff
Merge stuff, remove other stuff