added schema check when saving scenario, some minor changes