Fixed the mistakes.
Improved the scenario.