diff --git a/Gruntfile.js b/Gruntfile.js
index 06e694e..c3bdd63 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -48,12 +48,12 @@ module.exports = function (grunt) {
       pl.help();
     }
 
-    if (arg && arg === "starterkit-list") {
+    if (arg && arg === "liststarterkits") {
       pl.liststarterkits();
     }
 
-    if (arg && arg === "starterkit-load") {
-      pl.loadstarterkit(argv.kit);
+    if (arg && arg === "loadstarterkit") {
+      pl.loadstarterkit(argv.kit, argv.clean);
     }
 
     if (arg && (arg !== "version" && arg !== "patternsonly" && arg !== "help" && arg !== "starterkit-list" && arg !== "starterkit-load")) {
@@ -71,9 +71,11 @@ module.exports = function (grunt) {
       main: {
         files: [
           { expand: true, cwd: path.resolve(paths().source.js), src: '**/*.js', dest: path.resolve(paths().public.js) },
-          { expand: true, cwd: path.resolve(paths().source.css), src: '*.css', dest: path.resolve(paths().public.css) },
-          { expand: true, cwd: path.resolve(paths().source.images), src: '*', dest: path.resolve(paths().public.images) },
-          { expand: true, cwd: path.resolve(paths().source.fonts), src: '*', dest: path.resolve(paths().public.fonts) },
+          { expand: true, cwd: path.resolve(paths().source.js), src: '**/*.js.map', dest: path.resolve(paths().public.js) },
+          { expand: true, cwd: path.resolve(paths().source.css), src: '**/*.css', dest: path.resolve(paths().public.css) },        
+          { expand: true, cwd: path.resolve(paths().source.css), src: '**/*.css.map', dest: path.resolve(paths().public.css) },
+          { expand: true, cwd: path.resolve(paths().source.images), src: '**/*', dest: path.resolve(paths().public.images) },
+          { expand: true, cwd: path.resolve(paths().source.fonts), src: '**/*', dest: path.resolve(paths().public.fonts) },
           { expand: true, cwd: path.resolve(paths().source.root), src: 'favicon.ico', dest: path.resolve(paths().public.root) },
           { expand: true, cwd: path.resolve(paths().source.styleguide), src: ['*', '**'], dest: path.resolve(paths().public.root) },
           // slightly inefficient to do this again - I am not a grunt glob master. someone fix
@@ -151,6 +153,7 @@ module.exports = function (grunt) {
   ******************************************************/
 
   grunt.registerTask('default', ['patternlab', 'copy:main']);
+  grunt.registerTask('patternlab:build', ['patternlab', 'copy:main']);
   grunt.registerTask('patternlab:watch', ['patternlab', 'copy:main', 'watch:all']);
   grunt.registerTask('patternlab:serve', ['patternlab', 'copy:main', 'browserSync', 'watch:all']);
 
diff --git a/README.md b/README.md
index 3a1e1d6..8dfd38c 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ To list all available commands type:
 
 To generate the front-end for Pattern Lab type:
 
-    grunt patternlab:build
+    grunt
 
 ### Watch for changes and re-generate Pattern Lab
 
diff --git a/patternlab-config.json b/patternlab-config.json
index f0ca808..51c09e7 100644
--- a/patternlab-config.json
+++ b/patternlab-config.json
@@ -55,11 +55,6 @@
   "ishMinimum": "240",
   "ishMaximum": "2600",
   "patternStateCascade": ["inprogress", "inreview", "complete"],
-  "patternStates": {
-    "molecules-single-comment" : "complete",
-    "organisms-sticky-comment" : "inreview",
-    "templates-article" : "complete"
-  },
   "patternExportPatternPartials": [],
   "patternExportDirectory": "./pattern_exports/",
   "baseurl" : "",