Even more tweaks.
Merge pull request #52 from johnb30/mods

Even more tweaks.