Index review

Addresses #80, Generally the indexes looked pretty good.
I think it's probably to review this on a case by case basis as performance issues arise.