Fix the choice form type and some typos