Fixed Docblocks

Replaces #83 with a couple of other minor fixes.