fixed docblocks and removed inheritdoc markup where not appliable