Fixed some wonkiness in the indexing (thanks AN)
Typo fix :)