Typo and form fixes