sync with upstream, fix typos, start a-z ordering and cleanup