Add configuration template

(smaller cleanups)