Fixed rendering. Tidy and move on to collisions