Major cleansing
Fixes and other things, but mostly fixes