some tweaks and revisions
Merge pull request #1 from jonathanpenn/master

some tweaks and revisions