a bit cleanup, and add new cbs for new esil-vm