Edits to commands

Reuses: 566584b3dbfa866ece248d72ab78f03340dddb34
Merge branch 'ff-fixes-snippets-1' into sublime-text-3