More bugs fixed.
Added unified machine.