minor tweaks and fixes
Merge pull request #95 from bramwell2010/develop

minor tweaks and fixes