DOC: various editing