Bugfixes in templates. The rewriting is a lot of work.