autoMove improvements/fixes