Fixing problems in MP, to be continued...
Re-writing machines (again!)