fixed debug, fixed collision, fixed warnings