Merge pull request #76 from adrianp/cswwd

washers, templates, configuration: various fixes