diff --git a/.cfformat.json b/.cfformat.json
index ff8178cc..0233515e 100644
--- a/.cfformat.json
+++ b/.cfformat.json
@@ -17,19 +17,19 @@
 	"function_call.multiline.leading_comma.padding": true,
 	"function_call.casing.builtin": "cfdocs",
 	"function_call.casing.userdefined": "camel",
-	"function_call.multiline.element_count": 3,
+	"function_call.multiline.element_count": 2,
 	"function_call.multiline.leading_comma": false,
 	"function_call.multiline.min_length": 40,
 	"function_declaration.padding": true,
 	"function_declaration.empty_padding": false,
 	"function_declaration.multiline.leading_comma": false,
 	"function_declaration.multiline.leading_comma.padding": true,
-	"function_declaration.multiline.element_count": 3,
+	"function_declaration.multiline.element_count": 2,
 	"function_declaration.multiline.min_length": 40,
 	"function_declaration.group_to_block_spacing": "compact",
 	"function_anonymous.empty_padding": false,
 	"function_anonymous.group_to_block_spacing": "compact",
-	"function_anonymous.multiline.element_count": 3,
+	"function_anonymous.multiline.element_count": 2,
 	"function_anonymous.multiline.leading_comma": false,
 	"function_anonymous.multiline.leading_comma.padding": true,
 	"function_anonymous.multiline.min_length": 40,
@@ -44,6 +44,7 @@
 	"max_columns": 120,
 	"metadata.multiline.element_count": 3,
 	"metadata.multiline.min_length": 40,
+	"method_call.chain.multiline" : 3,
 	"newline":"\n",
 	"property.multiline.element_count": 3,
 	"property.multiline.min_length": 40,
diff --git a/box.json b/box.json
index cd81fae1..38e3f2e0 100644
--- a/box.json
+++ b/box.json
@@ -44,9 +44,10 @@
         "mockdatacfc":"system/modules/mockdatacfc/"
     },
     "scripts":{
-        "toMaster":"recipe build/toMaster.boxr",
+        "release":"recipe build/release.boxr",
         "format":"cfformat run system/**/*.cfc,test-harness/**/*.cfc,tests/specs/**/*.cfc,*.cfc --overwrite",
-        "format:check":"cfformat run system/**/*.cfc,test-harness/**/*.cfc,tests/specs/**/*.cfc,*.cfc --check",
+		"format:check":"cfformat run system/**/*.cfc,test-harness/**/*.cfc,tests/specs/**/*.cfc,*.cfc --check",
+		"format:watch":"cfformat watch system/**/*.cfc,test-harness/**/*.cfc,tests/specs/**/*.cfc,*.cfc ./.cfformat.json",
         "start:lucee":"server start serverConfigFile=server-lucee@5.json",
         "start:2016":"server start serverConfigFile=server-adobe@2016.json",
         "start:2018":"server start serverConfigFile=server-adobe@2018.json"
diff --git a/build/toMaster.boxr b/build/release.boxr
similarity index 96%
rename from build/toMaster.boxr
rename to build/release.boxr
index f431e7f5..e44b9c63 100644
--- a/build/toMaster.boxr
+++ b/build/release.boxr
@@ -2,7 +2,7 @@
 
 # Check out master
 !git checkout -f master
-!git pull
+!git pull origin master
 # Merge development into it
 !git merge --no-ff development
 # Tag the master repo with the version in box.json