putting the machine back to production code. small changes.