Add noting and labelling features to generate_scenario