update: Motion fixes and dragging

* Updated motion to actually resemble what is really going on

* Fixed slight dragging issue

Signed-off-by: mr.Shu <mr@shu.io>