lots of add_story fixes