More physics tweaks and changes