Rocks rotated
made cylinders again, racked rocks closer
conflit fix