Minor changes

- Don't diminish YASnippet
- Fix typos and erroneous comments