fixes for motion model