Adding more indexes

Added a bunch in places I think we'll need them. Closes #44