bug fixes and scenario description