Improved collision detection, added rotation functionality to some shapes