Fix derp
Lots of fixes and clean ups