Updated documentation and docblocks