Improved debuggin and less output in scenario