collision problems mostly fixed