Added boulder collisions and cleaning up