added all original scenarios and solutions (and modified them, because some functions changed) + bug fixes