Minor Changes and added MainStoryState

Changed the main story state to look like Marcel's excellent story
state.