Working on PETR integration.
More tweaks.
Merge pull request #51 from johnb30/mods

Mods