Cleaned up physics model a bit