more formatting and template work - ready for a master branch tag