introduced DeploymentOptions and a few tweaks and tests