bug fixes, clarify comments in motion model