Changed a whole bunch of crap
Removed some old cruft