Added and updated indexes.

Some of the classes were missing keys. Others needed to have their indexes upgraded to also be unique.