Added machines and fixed headers