Rework of the motion model, to make it more explcit.
Update docstrings, small enhancements to Oskar's motion rework.