Fixed rendering and collisions