PSR-1.  Added/Updated DocBlocks where needed.