Lots O' Bug Fixes