Some simple fixes
Redo @method declarations
Tinkering with @method to get intended result
Merge pull request #203 from geekwright/fixes

Various Small Fixes