diff --git a/.jshintrc b/.jshintrc
index db63befe3..f03a6dc8f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -2,6 +2,9 @@
     "asi": true,        // allow missing semicolons
     "curly": true,      // require braces
     "eqnull": true,     // ignore ==null
+    //"eqeqeq": true,   // enforce ===
+    "freeze": true,     // don't allow override
+    "indent": 4,        // default indent of 4
     "forin": true,      // require property filtering in "for in" loops
     "immed": true,      // require immediate functions to be wrapped in ( )
     "nonbsp": true,     // warn on unexpected whitespace breaking chars
diff --git a/Gruntfile.js b/Gruntfile.js
index 13584dc9a..1b265190e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -47,7 +47,8 @@ module.exports = function(grunt) {
                 timeout: 3000,
                 ignoreLeaks: false,
                 ui: 'bdd',
-                reporter: 'spec'
+                reportFormats: ['lcov'],
+                print: 'both'
             },
             coverage: { src: ['test/**/*_spec.js'] }
         },
@@ -427,7 +428,7 @@ module.exports = function(grunt) {
             " **/\n";
 
         if (files) {
-            for (var i=0;i<files.length;i++) {
+            for (var i=0; i<files.length; i++) {
                 var file = files[i];
                 if (!grunt.file.exists(file)) {
                     grunt.log.warn('File '+ file + ' not found');
@@ -482,4 +483,7 @@ module.exports = function(grunt) {
         'Create distribution zip file',
         ['build','clean:release','copy:release','chmod:release','compress:release']);
 
+    grunt.registerTask('coverage',
+        'Run Istanbul code test coverage task',
+        ['build','mocha_istanbul']);
 };