meteor update
rough collision detection working