More scenarios, with fixes
Version bump