Fixed a hella lot of stuff