Added some cannon stuff, fixed annoying collision.cpp warnings