misc fixes to address some collision dynamics.