Small edits before trying to rework index changed stuff