Small doc-block and code fixes

This adds some small fixes for doc-blocks and code.

I'll let Travis run the tests this time.