Buggy but improved collision math