cleaned up collision detection a tad