index cleaned up, need to find a way to deal with data