update compact scenario
update full scenario
small fixes