minor changes in config and tests
templating (with tests)
errata in docs