more minor changes to STATE_ indexing
4 files changed