Bunch of Fixes and Stuff