fix up a bunch of mix-ups in conjugation