bug fixes
experiment with tighter collisions