(core/retro) more work on rollback mode