Angle analysis updates

Updated to select the correct collision angle. Still needs more testing.