Add ending data key to word form descriptor.
Add ending data key to word form descriptor; minor.
Add indices.