Fix error messages and tweak help strings.