more tweaks, moving machines