fixes for storyline issues