few minor fixes
Merge pull request #1 from erjohnso/wrap-up

few minor fixes