Updating physics and tidying