Fixed a bunch of stuff

(y)