Better physics

updating master as there have been lots of unit test changes.