add comments and buf-move commands