New machine tweaks and clean ups