More collision work and a few changes