diff --git a/.jscs.json b/.jscs.json
index caa03b9..af756e1 100644
--- a/.jscs.json
+++ b/.jscs.json
@@ -9,13 +9,17 @@
 
 	"disallowIdentifierNames": [],
 
-	"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
+	"requireCurlyBraces": {
+		"allExcept": [],
+		"keywords": ["if", "else", "for", "while", "do", "try", "catch"]
+	},
 
 	"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"],
 
 	"disallowSpaceAfterKeywords": [],
 
 	"disallowSpaceBeforeComma": true,
+	"disallowSpaceAfterComma": false,
 	"disallowSpaceBeforeSemicolon": true,
 
 	"disallowNodeTypes": [
@@ -26,7 +30,7 @@
 		"WithStatement"
 	],
 
-	"requireObjectKeysOnNewLine": false,
+	"requireObjectKeysOnNewLine": { "allExcept": ["sameLine"] },
 
 	"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true },
 	"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
@@ -75,7 +79,7 @@
 
 	"disallowMultipleLineStrings": true,
 
-	"requireDotNotation": true,
+	"requireDotNotation": { "allExcept": ["keywords"] },
 
 	"requireParenthesesAroundIIFE": true,
 
@@ -125,6 +129,11 @@
 
 	"disallowNestedTernaries": { "maxLevel": 1 },
 
-	"requireSpaceAfterComma": true
+	"requireSpaceAfterComma": { "allExcept": ["trailing"] },
+	"requireAlignedMultilineParams": false,
+
+	"requireSpacesInGenerator": {
+		"afterStar": true
+	}
 }
 
diff --git a/package.json b/package.json
index 0802ba2..3a38d34 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
 		"lint": "npm run jscs && npm run eslint",
 		"eslint": "eslint test/*.js *.js",
 		"jscs": "jscs test/*.js *.js",
-		"security": "nsp package"
+		"security": "nsp check"
 	},
 	"repository": {
 		"type": "git",
@@ -41,13 +41,13 @@
 		"function-bind": "^1.0.2"
 	},
 	"devDependencies": {
-		"tape": "^4.2.1",
+		"tape": "^4.2.2",
 		"array-map": "^0.0.0",
 		"covert": "^1.1.0",
-		"jscs": "^2.3.3",
-		"nsp": "^1.1.0",
-		"eslint": "^1.7.1",
-		"@ljharb/eslint-config": "^1.4.0",
+		"jscs": "^2.5.1",
+		"nsp": "^2.0.2",
+		"eslint": "^1.9.0",
+		"@ljharb/eslint-config": "^1.6.0",
 		"@es-shims/api": "^1.0.0"
 	},
 	"testling": {