Fix some minor YAML issues, update some meta

- Various YAML command updates based on auf's suggestions
- more tag grouping