preparing for scenario comparison
small fixes