Added scenarios, graphs, fixed bugs