DOC: Final tweaking, for now.