Added more identifiers, fixed typo.