more bug fixes. first scenario passes...