Changed where the state is saved in index rebuild
Resolved some SNIFF errors