Fix up docblocks and make consistent with interfaces