minor fixes
Improving docblocks and fixing minor issues