More power.

- Now parses level2-level6 Headings
- Simplified some k = value parsing at the same time