Fixed collision detection with the world shape

Topped with some TAB to Space conversion :)