A Whole Bunch of Bugfixes