A lot of enhancements to my-deploy-laptop