minor updates to movement; name re-factoring