Lots of physics-related tweaks