Merge pull request #204 from AutomationSupport/pfire

doc updates and misc fixes
removing a templated thingy
better spacing
better code escaping