Updates to the templates, and setup.py