more tweaks
Merge pull request #36 from jmdetloff/john/tweaks

more tweaks