bug fixes for collision
fixed collision bugs