More scenarios, some fixes