Moar story fixes