fixed some of the index