Fix up docblocks and strings