use movep as default, small cleanups many places