2 files changed, 12 insertions, 9 deletions

diff --git a/python/gras/stats/charts.js b/python/gras/stats/charts.js
index 1af39bb..5f0f65c 100644
--- a/python/gras/stats/charts.js
+++ b/python/gras/stats/charts.js
@@ -23,17 +23,18 @@ var gras_setup_per_block_enable_checkbox = function(elem, id, registry)
         type: 'checkbox',
         name: id
     });
-    registry.block_enables[id] = true;
+    registry.block_enables[id] = false;
     input.attr('checked', registry.block_enables[id]);
     input.change(function()
     {
         registry.block_enables[id] = input.is(':checked');
-        gras_update_throughput_chart(registry);
+        //gras_update_throughput_chart(registry);
         var div = $('#per_block_charts');
         gras_animate_show_hide($('table[name="' + id + '"]', div), registry.block_enables[id]);
     });
     $(elem).append(input);
     $(elem).append(' ');
+    input.change();
 }
 
 var gras_setup_per_block_charts = function(id, registry)
@@ -48,7 +49,6 @@ var gras_setup_per_block_charts = function(id, registry)
     var td = $('td:last', table);
     var chart = new google.visualization.PieChart(td.get(0));
     registry.block_charts[id] = chart;
-
 }
 
 var gras_setup_individual_charts = function(registry)
@@ -59,8 +59,8 @@ var gras_setup_individual_charts = function(registry)
     var count = 0;
     $.each(registry.getBlockIds(), function(index, id)
     {
-        gras_setup_per_block_enable_checkbox(config, id, registry);
         gras_setup_per_block_charts(id, registry);
+        gras_setup_per_block_enable_checkbox(config, id, registry);
         count++;
         if (count == Math.round(registry.getBlockIds().length/2))
         {
diff --git a/python/gras/stats/main.js b/python/gras/stats/main.js
index 35287cc..9659024 100644
--- a/python/gras/stats/main.js
+++ b/python/gras/stats/main.js
@@ -19,10 +19,10 @@ var gras_query_stats = function(registry)
                     gras_update_per_block_charts(registry);
                 }
 
-                var onceHandle = window.setTimeout(function()
+                registry.timeout_handle = window.setTimeout(function()
                 {
-                  gras_query_stats(registry);
-                }, (1.0/registry.overall_rate));
+                    gras_query_stats(registry);
+                }, Math.round(1000/registry.overall_rate));
             }
         }
     });
@@ -36,6 +36,8 @@ var gras_stats_main = function()
     var registry = new GrasStatsRegistry();
     var overall_config = $('#overall_config').get(0);
 
+    gras_setup_overall_chart(registry);
+
     //init overall config gui element for rate
     var overall_rate = $('input[name="rate"]', overall_config);
     overall_rate.val(registry.overall_rate);
@@ -52,17 +54,18 @@ var gras_stats_main = function()
     {
         registry.overall_active = overall_active.is(':checked');
         if (registry.overall_active) gras_query_stats(registry);
+        else window.clearInterval(registry.timeout_handle);
     });
 
     //init overall config gui element for showing
     var overall_show = $('input[name="show"]', overall_config);
-    overall_show.attr('checked', true);
+    overall_show.attr('checked', false);
     overall_show.change(function()
     {
         var chart = $('#overall_chart');
         gras_animate_show_hide(chart, overall_show.is(':checked'));
     });
+    overall_show.change();
 
-    gras_setup_overall_chart(registry);
     gras_query_stats(registry);
 }