Update doc (+ minor changes)