Final cleanup
Fixed a whole bunch of issues :)