minor tweaks to get v2 machine working.