Implement index, fix some niggles.
Disable dump.