Add a dummy rotate controller
Improve collision detection