Fixed collision detection.  Made it simpler.