More collision detection work
Updated bug log