more collision corrections. more to come