Fixed up some of the story elements