fix typo, catch a couple of extra verbs and user typos