Added new scenario and fixed a lot of bugs...