Lots of Fixes and Stuff