Update diagram, fix typos