Minor changes to index and data/