Improvements to State order in story. Some bugfixes.