Add 2 commands, other minor edits