Update doc and fix typos