Modified some docblocks and comments