Docblocks fixes and other minor adjustements made.