Stories improvement

Fixed a lot of stuff for stories.