updates to machine-setup