Improving docblocks and fixing minor issues