Misc tweaks.
Rename story.