Recommit: Improve kinetic friction. Generalise plane collisions (WIP)