DOC: some improvements