Closer to several fixes. Switching machines.