Improved reindexing and working on optimizations for diskstorage.