Controls Overhaul

And LOTS of other fixes