Added collision detection and cannon rotation