fix kind typo and indexes