more tweaks
Merge pull request #3 from etipton/more_tweaks

more tweaks