readd engine, add back various cbc and non-asm variants