Updating docblocks, tests, and README