Updated a lot of stuff

Fixed a lot of code (and broke some)