Fixes for a whole crap load of stuff