Minor Story improvement

and a few minor tweaks