more motion fixes