Fix setting and add a couple of templates