Done cleaning up
Fixed stuff