Finished console commands (mostly) and improved collision