collision detection - initial implementation fixes