Bug Fixes and deleted debugs