More work on guides.
 - Add more tests
 - Fix some finger-trouble bugs I added in prev commits
 - Convert multi-value fields to Enums