more cleaning and bug fixes.  collision detection should be working.