Merge pull request #57 from IGoldthwaite/master

small tweaks across the board