Some improvements to doc-strings only