Fixed reinit
Fixed motion and improved change
Minor update to docs