more commands, fix replace