More optimizations and indexes for #75
Merge pull request #77 from Cerberus98/moar_indices

More optimizations and indexes for #75