commenting out auto-reindexing
pin and minor fix