Index updated & fixes