gang-move: small changes/add