WIP: remove more typos