Automation tweaks. Making certain values configurable