first-pass nitpick
Merge pull request #55 from atax1a/master

first-pass nitpick
lengthen some stubs
Merge pull request #56 from washort/master

lengthen some stubs