Improved scripts a bit to be easier to automatically deploy.