WIP: Improvements from user suggestions

This fixes the issue with the index not persisting across resets?