added simple contact/collision resolution