bug fixes. on scenario play and export