Add templating into the build process
Typo fixes