fixed collision detection errors, updates