added scenario and catch bug fixes.