config fixes
more template fixes