Fixed a lot of stuff, improved some code stuff too