Bug Fixes and other Stuff