fix typo and field names