slightly improved collision mechanics