Fixes

Fixed stuff, and deleted stuff