diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 1adffe69..1cc04251 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -214,28 +214,29 @@ class StatsController < ApplicationController
       "SELECT c.name AS name, c.id as id, count(*) AS total "+
         "FROM contexts c, todos t "+
         "WHERE t.context_id=c.id AND t.completed_at IS NULL AND NOT c.hide "+
+        "AND c.user_id = #{current_user.id} " +
         "GROUP BY c.name, c.id "+
         "ORDER BY total DESC"
     )
+    @sum = @all_actions_per_context.inject(0){|sum, apc| sum += apc['total'].to_i }
 
     pie_cutoff=10
-    size = @all_actions_per_context.size()
-    size = pie_cutoff if size > pie_cutoff
-    @actions_per_context = Array.new(size)
-    0.upto size-1 do |i|
-      @actions_per_context[i] = @all_actions_per_context[i]
-    end
+    size = [@all_actions_per_context.size, pie_cutoff].min
+
+    # explicitely copy contents of hash to avoid ending up with two arrays pointing to same hashes
+    @actions_per_context = Array.new(size){|i| {
+      'name' => @all_actions_per_context[i][:name],
+      'total' => @all_actions_per_context[i][:total].to_i,
+      'id' => @all_actions_per_context[i][:id]
+      } }
 
     if size==pie_cutoff
       @actions_per_context[size-1]['name']=t('stats.other_actions_label')
-      @actions_per_context[size-1]['total']=0
+      @actions_per_context[size-1]['total']=@actions_per_context[size-1]['total']
       @actions_per_context[size-1]['id']=-1
-      (size-1).upto @all_actions_per_context.size()-1 do |i|
-        @actions_per_context[size-1]['total']+=@all_actions_per_context[i]['total'].to_i
-      end
+      (size).upto(@all_actions_per_context.size()-1){|i| @actions_per_context[size-1]['total']+=@all_actions_per_context[i]['total'].to_i }
     end
 
-    @sum = @all_actions_per_context.inject(0){|sum, apc| sum += apc['total'].to_i }
     @truncate_chars = 15
 
     render :layout => false
@@ -282,17 +283,11 @@ class StatsController < ApplicationController
 
     # convert to hash to be able to fill in non-existing days
     @actions_creation_hour_array = Array.new(24) { |i| 0}
-    @actions_creation_hour.each do |r|
-      hour = r.created_at.hour
-      @actions_creation_hour_array[hour] += 1
-    end
+    @actions_creation_hour.each{|r| @actions_creation_hour_array[r.created_at.hour] += 1 }
 
     # convert to hash to be able to fill in non-existing days
     @actions_completion_hour_array = Array.new(24) { |i| 0}
-    @actions_completion_hour.each do |r|
-      hour = r.completed_at.hour
-      @actions_completion_hour_array[hour] += 1
-    end
+    @actions_completion_hour.each{|r| @actions_completion_hour_array[r.completed_at.hour] += 1 }
 
     @max = [@actions_creation_hour_array.max, @actions_completion_hour_array.max].max
 
@@ -305,17 +300,11 @@ class StatsController < ApplicationController
 
     # convert to hash to be able to fill in non-existing days
     @actions_creation_hour_array = Array.new(24) { |i| 0}
-    @actions_creation_hour.each do |r|
-      hour = r.created_at.hour
-      @actions_creation_hour_array[hour] += 1
-    end
+    @actions_creation_hour.each{|r| @actions_creation_hour_array[r.created_at.hour] += 1 }
 
     # convert to hash to be able to fill in non-existing days
     @actions_completion_hour_array = Array.new(24) { |i| 0}
-    @actions_completion_hour.each do |r|
-      hour = r.completed_at.hour
-      @actions_completion_hour_array[hour] += 1
-    end
+    @actions_completion_hour.each{|r| @actions_completion_hour_array[r.completed_at.hour] += 1 }
 
     @max = [@actions_creation_hour_array.max, @max = @actions_completion_hour_array.max].max
 
@@ -350,19 +339,12 @@ class StatsController < ApplicationController
       end
 
       # get all running actions that are visible
-      @actions_running_time = current_user.todos.find_by_sql([
-          "SELECT t.id, t.created_at "+
-            "FROM todos t LEFT OUTER JOIN projects p ON t.project_id = p.id LEFT OUTER JOIN contexts c ON t.context_id = c.id "+
-            "WHERE t.completed_at IS NULL " +
-            "AND t.show_from IS NULL " +
-            "AND NOT (p.state='hidden' OR c.hide=?) " +
-            "ORDER BY t.created_at ASC", true]
-      )
+      @actions_running_time = current_user.todos.not_completed.not_hidden.not_deferred_or_blocked.find(
+        :all, :select => "todos.id, todos.created_at", :order => "todos.created_at DESC")
 
-      @selected_todo_ids, @count = get_ids_from(@actions_running_time, week_from, week_to, params['id']== 'avrt_end')
-      @selected_actions = current_user.todos.find(:all, {
-          :conditions => "id in (" + @selected_todo_ids + ")"
-        })
+      selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id']== 'avrt_end')
+      @selected_actions = selected_todo_ids.size == 0 ? [] : current_user.todos.find(:all, { :conditions => "id in (" + selected_todo_ids.join(",") + ")" })
+      @count = @selected_actions.size
 
       render :action => "show_selection_from_chart"
 
@@ -383,9 +365,10 @@ class StatsController < ApplicationController
       # get all running actions
       @actions_running_time = current_user.todos.not_completed.find(:all, { :select => "id, created_at" })
 
-      @selected_todo_ids, @count = get_ids_from(@actions_running_time, week_from, week_to, params['id']=='art_end')
-      @selected_actions = current_user.todos.find(:all, { :conditions => "id in (" + @selected_todo_ids + ")" })
-
+      selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id']=='art_end')
+      @selected_actions = selected_todo_ids.size == 0 ? [] : current_user.todos.find(:all, { :conditions => "id in (" + selected_todo_ids.join(",") + ")" })
+      @count = @selected_actions.size
+      
       render :action => "show_selection_from_chart"
     else
       # render error
@@ -412,7 +395,8 @@ class StatsController < ApplicationController
         "SELECT DISTINCT tags.id as id "+
           "FROM tags, taggings, todos "+
           "WHERE tags.id = taggings.tag_id " +
-          "AND taggings.taggable_id = todos.id "])
+          "AND taggings.taggable_id = todos.id "+
+          "AND todos.user_id = #{current_user.id}"])
     tags_ids_s = tag_ids.map(&:id).sort.join(",")
     return {} if tags_ids_s.blank?  # return empty hash for .size to work
     return Tag.find(:all, :conditions => "id in (" + tags_ids_s + ")")
@@ -424,7 +408,8 @@ class StatsController < ApplicationController
         "SELECT tags.id as id "+
           "FROM tags, taggings, todos "+
           "WHERE tags.id = taggings.tag_id " +
-          "AND taggings.taggable_id = todos.id "]).size
+          "AND taggings.taggable_id = todos.id " +
+          "AND todos.user_id = #{current_user.id}"]).size
   end
 
   def init
@@ -453,23 +438,23 @@ class StatsController < ApplicationController
     # time to complete
     @completed_actions = current_user.todos.completed.find(:all, { :select => "completed_at, created_at" })
 
-    actions_sum, actions_max, actions_min = 0,0,-1
+    actions_sum, actions_max = 0,0
+    actions_min = @completed_actions.first.completed_at - @completed_actions.first.created_at
+    
     @completed_actions.each do |r|
       actions_sum += (r.completed_at - r.created_at)
       actions_max = [(r.completed_at - r.created_at), actions_max].max
-
-      actions_min = (r.completed_at - r.created_at) if actions_min == -1
       actions_min = [(r.completed_at - r.created_at), actions_min].min
     end
 
     sum_actions = @completed_actions.size
-    sum_actions = 1 if sum_actions==0
+    sum_actions = 1 if sum_actions==0 # to prevent dividing by zero
 
     @actions_avg_ttc = (actions_sum/sum_actions)/@seconds_per_day
     @actions_max_ttc = actions_max/@seconds_per_day
     @actions_min_ttc = actions_min/@seconds_per_day
 
-    min_ttc_sec = Time.utc(2000,1,1,0,0)+actions_min
+    min_ttc_sec = Time.utc(2000,1,1,0,0)+actions_min # convert to a datetime
     @actions_min_ttc_sec = (min_ttc_sec).strftime("%H:%M:%S")
     @actions_min_ttc_sec = (actions_min / @seconds_per_day).round.to_s + " days " + @actions_min_ttc_sec if actions_min > @seconds_per_day
 
@@ -491,6 +476,7 @@ class StatsController < ApplicationController
       "SELECT c.id AS id, c.name AS name, count(*) AS total "+
         "FROM contexts c, todos t "+
         "WHERE t.context_id=c.id "+
+        "AND t.user_id=#{current_user.id} " +
         "GROUP BY c.id, c.name ORDER BY total DESC " +
         "LIMIT 5"
     )
@@ -503,6 +489,7 @@ class StatsController < ApplicationController
       "SELECT c.id AS id, c.name AS name, count(*) AS total "+
         "FROM contexts c, todos t "+
         "WHERE t.context_id=c.id AND t.completed_at IS NULL AND NOT c.hide "+
+        "AND t.user_id=#{current_user.id} " +
         "GROUP BY c.id, c.name ORDER BY total DESC " +
         "LIMIT 5"
     )
@@ -517,6 +504,7 @@ class StatsController < ApplicationController
       "SELECT p.id, p.name, count(*) AS count "+
         "FROM projects p, todos t "+
         "WHERE p.id = t.project_id "+
+        "AND t.user_id=#{current_user.id} " +
         "GROUP BY p.id, p.name "+
         "ORDER BY count DESC " +
         "LIMIT 10"
@@ -532,6 +520,7 @@ class StatsController < ApplicationController
           "FROM todos t, projects p "+
           "WHERE t.project_id = p.id AND "+
           "      (t.created_at > ? OR t.completed_at > ?) "+
+          "AND t.user_id=#{current_user.id} " +
           "GROUP BY p.id, p.name "+
           "ORDER BY count DESC " +
           "LIMIT 10", @cut_off_month, @cut_off_month]
@@ -543,7 +532,7 @@ class StatsController < ApplicationController
       "SELECT id, name, created_at "+
         "FROM projects "+
         "WHERE state='active' "+
-        "AND user_id="+@user.id.to_s+" "+
+        "AND user_id=#{current_user.id} "+
         "ORDER BY created_at ASC "+
         "LIMIT 10"
     )
@@ -551,8 +540,8 @@ class StatsController < ApplicationController
     i=0
     @projects_and_runtime = Array.new(10, [-1, "n/a", "n/a"])
     @projects_and_runtime_sql.each do |r|
-      days = (@today - r.created_at) / @seconds_per_day
-      # add one so that a project that you just create returns 1 day
+      days = difference_in_days(@today, r.created_at)
+      # add one so that a project that you just created returns 1 day
       @projects_and_runtime[i]=[r.id, r.name, days.to_i+1]
       i += 1
     end
@@ -609,33 +598,21 @@ class StatsController < ApplicationController
     }
 
     @tags_divisor_90days = ((max_90days - @tags_min_90days) / levels) + 1
-
   end
 
-  def get_ids_from (actions_running_time, week_from, week_to, at_end)
-    count=0
-    selected_todo_ids = ""
+  def get_ids_from (actions, week_from, week_to, at_end)
+    selected_todo_ids = []
 
-    actions_running_time.each do |r|
-      days = (@today - r.created_at) / @seconds_per_day
-      weeks = (days/7).to_i
+    actions.each do |r|
+      weeks = difference_in_weeks(@today, r.created_at)
       if at_end
-        if weeks >= week_from
-          selected_todo_ids += r.id.to_s+","
-          count+=1
-        end
+        selected_todo_ids << r.id.to_s if weeks >= week_from
       else
-        if weeks.between?(week_from, week_to-1)
-          selected_todo_ids += r.id.to_s+","
-          count+=1
-        end
+        selected_todo_ids << r.id.to_s if weeks.between?(week_from, week_to-1)
       end
     end
 
-    # strip trailing comma
-    selected_todo_ids = selected_todo_ids[0..selected_todo_ids.length-2]
-
-    return selected_todo_ids, count
+    return selected_todo_ids
   end
 
   def convert_to_array(hash, upper_bound)
diff --git a/app/models/todo.rb b/app/models/todo.rb
index 6f6cd1f4..a5bfd8d4 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -26,7 +26,7 @@ class Todo < ActiveRecord::Base
   named_scope :blocked, :conditions => ['todos.state = ?', 'pending']
   named_scope :pending, :conditions => ['todos.state = ?', 'pending']
   named_scope :deferred_or_blocked, :conditions => ["(todos.completed_at IS NULL AND NOT(todos.show_from IS NULL)) OR (todos.state = ?)", "pending"]
-  named_scope :not_deferred_or_blocked, :conditions => ["todos.completed_at IS NULL AND todos.show_from IS NULL AND NOT(todos.state = ?)", "pending"]
+  named_scope :not_deferred_or_blocked, :conditions => ["(todos.completed_at IS NULL) AND (todos.show_from IS NULL) AND (NOT todos.state = ?)", "pending"]
   named_scope :hidden,
     :joins => "INNER JOIN contexts c_hidden ON c_hidden.id = todos.context_id",
     :conditions => ["todos.state = ? OR (c_hidden.hide = ? AND (todos.state = ? OR todos.state = ? OR todos.state = ?))",
diff --git a/app/views/stats/actions_day_of_week_30days_data.html.erb b/app/views/stats/actions_day_of_week_30days_data.html.erb
index 5e884466..a61fe6a6 100755
--- a/app/views/stats/actions_day_of_week_30days_data.html.erb
+++ b/app/views/stats/actions_day_of_week_30days_data.html.erb
@@ -1,23 +1,16 @@
 &title=<%= t('stats.actions_dow_30days_title') %>,{font-size:16},&
-&y_legend=<%= t('stats.actions_dow_30days_legend.number_of_actions') %>,12,0x736AFF&
-&x_legend=<%= t('stats.actions_dow_30days_legend.day_of_week') %>,12,0x736AFF&
+&y_legend=<%= t('stats.actions_dow_30days_legend.number_of_actions') %>,10,0x736AFF&
+&x_legend=<%= t('stats.actions_dow_30days_legend.day_of_week') %>,10,0x736AFF&
 &y_ticks=5,10,5&
 &filled_bar=50,0x9933CC,0x8010A0,<%= t('stats.labels.created') %>,8&
 &filled_bar_2=50,0x0066CC,0x0066CC,<%= t('stats.labels.completed') %>,8&
-&values=<% 
-0.upto 5 do |i| -%>
-  <%=@actions_creation_day_array[i] -%>,
-<% end -%><%=@actions_creation_day_array[6]%>&
-&values_2=<% 
-0.upto 5 do |i| -%>
-  <%=@actions_completion_day_array[i] -%>,
-<% end -%><%=@actions_completion_day_array[6]%>&
-&x_labels= <% 
-0.upto 5 do |i| -%>
-  <%=Date::DAYNAMES[i] -%>,
-<% end -%><%=Date::DAYNAMES[6]%>&
+&values=<%=  @actions_creation_day_array.join(",") %>&
+&values_2=<%= @actions_completion_day_array.join(",") %>&
+&x_labels=<%= Date::DAYNAMES.join(",") %>&
 &y_min=0&
-<% # add one to @max for people who have no actions completed yet. 
-   # OpenFlashChart cannot handle y_max=0 -%>
+<%
+  # add one to @max for people who have no actions completed yet.
+  # OpenFlashChart cannot handle y_max=0
+-%>
 &y_max=<%=@max+1 -%>&
 &x_label_style=9,,2,1&
\ No newline at end of file
diff --git a/app/views/stats/actions_day_of_week_all_data.html.erb b/app/views/stats/actions_day_of_week_all_data.html.erb
index 8accb729..1e8d23da 100755
--- a/app/views/stats/actions_day_of_week_all_data.html.erb
+++ b/app/views/stats/actions_day_of_week_all_data.html.erb
@@ -1,23 +1,16 @@
 &title=<%= t('stats.actions_day_of_week_title') %>,{font-size:16},&
-&y_legend=<%= t('stats.actions_day_of_week_legend.number_of_actions') %>,12,0x736AFF&
-&x_legend=<%= t('stats.actions_day_of_week_legend.day_of_week') %>,12,0x736AFF&
+&y_legend=<%= t('stats.actions_day_of_week_legend.number_of_actions') %>,10,0x736AFF&
+&x_legend=<%= t('stats.actions_day_of_week_legend.day_of_week') %>,10,0x736AFF&
 &y_ticks=5,10,5&
-&filled_bar=50,0x9933CC,0x8010A0,<%= t('stats.labels.created')%>,8&
+&filled_bar=50,0x9933CC,0x8010A0,<%= t('stats.labels.created') %>,8&
 &filled_bar_2=50,0x0066CC,0x0066CC,<%= t('stats.labels.completed') %>,8&
-&values=<% 
-0.upto 5 do |i| -%>
-  <%=@actions_creation_day_array[i] -%>,
-<% end -%><%=@actions_creation_day_array[6]%>&
-&values_2=<% 
-0.upto 5 do |i| -%>
-  <%=@actions_completion_day_array[i] -%>,
-<% end -%><%=@actions_completion_day_array[6]%>&
-&x_labels= <% 
-0.upto 5 do |i| -%>
-  <%=Date::DAYNAMES[i] -%>,
-<% end -%><%=Date::DAYNAMES[6]%>&
+&values=<%=  @actions_creation_day_array.join(",") %>&
+&values_2=<%= @actions_completion_day_array.join(",") %>&
+&x_labels=<%= Date::DAYNAMES.join(",") %>&
 &y_min=0&
-<% # add one to @max for people who have no actions completed yet. 
-   # OpenFlashChart cannot handle y_max=0 -%>
+<%
+  # add one to @max for people who have no actions completed yet.
+  # OpenFlashChart cannot handle y_max=0
+-%>
 &y_max=<%=@max+1 -%>&
 &x_label_style=9,,2,1&
\ No newline at end of file
diff --git a/app/views/stats/context_running_actions_data.html.erb b/app/views/stats/context_running_actions_data.html.erb
index c856b71c..690a82f4 100755
--- a/app/views/stats/context_running_actions_data.html.erb
+++ b/app/views/stats/context_running_actions_data.html.erb
@@ -1,21 +1,15 @@
+<%
+  size = @actions_per_context.size()
+  pie_slices = Array.new(size){|i| @actions_per_context[i]['total'].to_i*100/@sum }
+  pie_labels = Array.new(size){|i| truncate(@actions_per_context[i]['name'], :length => @truncate_chars, :omission => '...') }
+  pie_links  = Array.new(size){|i| url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[i]['id']}
+-%>
 &title=<%= t('stats.spread_of_running_actions_for_visible_contexts') %>,{font-size:16}&
-&pie=60,#505050,{font-size: 12px; color: #404040;}& 
-&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20& 
-&values=<%
-0.upto @actions_per_context.size()-2 do | i |
-    %><%=@actions_per_context[i]['total'].to_i*100/@sum%>,<%
-end
--%><%=@actions_per_context[@actions_per_context.size()-1]['total'].to_i*100/@sum%>& 
-&pie_labels=<%
-0.upto @actions_per_context.size()-2 do | i |
-    %><%=truncate(@actions_per_context[i]['name'], :length => @truncate_chars, :omission => '...')%>,<%
-end
--%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], :length => @truncate_chars, :omission => '...') %>&
-&links=<%
-0.upto @actions_per_context.size()-2 do | i |
-    %><%=url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[i]['id']%>,<%
-end
--%><%=url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[@actions_per_context.size()-1]['id']%>& 
-&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f& 
-&tool_tip=#x_label#: #val#%25& 
+&pie=60,#505050,{font-size: 12px; color: #404040;}&
+&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&
+&values=<%=     pie_slices.join(",") %>&
+&pie_labels=<%= pie_labels.join(",") %>&
+&links=<%=      pie_links.join(",") %>&
+&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&
+&tool_tip=#x_label#: #val#%25&
 &x_label_style=9,,2,1&
\ No newline at end of file
diff --git a/app/views/stats/context_total_actions_data.html.erb b/app/views/stats/context_total_actions_data.html.erb
index 4f9c7679..733bb5a7 100755
--- a/app/views/stats/context_total_actions_data.html.erb
+++ b/app/views/stats/context_total_actions_data.html.erb
@@ -1,21 +1,15 @@
+<%
+  size = @actions_per_context.size()
+  pie_slices = Array.new(size){|i| @actions_per_context[i]['total'].to_i*100/@sum }
+  pie_labels = Array.new(size){|i| truncate(@actions_per_context[i]['name'], :length => @truncate_chars, :omission => '...') }
+  pie_links  = Array.new(size){|i| url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[i]['id']}
+-%>
 &title=<%= t('stats.spread_of_actions_for_all_context') %>,{font-size:16}&
-&pie=70,#505050,{font-size: 12px; color: #404040;}& 
-&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20& 
-&values=<%
-0.upto @actions_per_context.size()-2 do | i |
-    %><%=@actions_per_context[i]['total'].to_i*100/@sum%>,<%
-end
--%><%=@actions_per_context[@actions_per_context.size()-1]['total'].to_i*100/@sum%>& 
-&pie_labels=<%
-0.upto @actions_per_context.size()-2 do | i |
-    %><%=truncate(@actions_per_context[i]['name'], :length => @truncate_chars, :omission => '...') %>,<%
-end
--%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], :length => @truncate_chars, :omission => '...') %>&
-&links=<%
-0.upto @actions_per_context.size()-2 do | i |
-    %><%=url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[i]['id']%>,<%
-end
--%><%=url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[@actions_per_context.size()-1]['id']%>& 
-&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f& 
-&tool_tip=#x_label#: #val#%25& 
+&pie=70,#505050,{font-size: 12px; color: #404040;}&
+&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&
+&values=<%=     pie_slices.join(",") %>&
+&pie_labels=<%= pie_labels.join(",") %>&
+&links=<%=      pie_links.join(",") %>&
+&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&
+&tool_tip=#x_label#: #val#%25&
 &x_label_style=9,,2,1&
\ No newline at end of file
diff --git a/app/views/stats/show_selection_from_chart.html.erb b/app/views/stats/show_selection_from_chart.html.erb
index 28c13b18..15c3dc67 100644
--- a/app/views/stats/show_selection_from_chart.html.erb
+++ b/app/views/stats/show_selection_from_chart.html.erb
@@ -1,9 +1,18 @@
 <%= render :partial => 'chart', :locals => {:width => @chart_width, :height => @chart_height, :data => url_for(:action => @chart_name)} -%>
 <br/>
-<p><%= t('stats.click_to_update_actions') %> <%= t('stats.click_to_return', :link => link_to(t('stats.click_to_return_link'), {:controller => "stats", :action => "index"})) %> <%
-    unless @further -%> <%=
-    t('stats.click_to_show_actions_from_week', :link => link_to("here", {:controller => "stats", :action => "show_selected_actions_from_chart", :id=>"#{params[:id]}_end", :index => params[:index]}), :week => params[:index]) -%>
-    <% end %></p>
+<p>
+<%= t('stats.click_to_update_actions') %> <%= t('stats.click_to_return', :link => link_to(t('stats.click_to_return_link'), {:controller => "stats", :action => "index"})) %>
+<%
+    unless @further
+-%>
+<%= t('stats.click_to_show_actions_from_week',
+      :link => link_to("here", {:controller => "stats", :action => "show_selected_actions_from_chart", :id=>"#{params[:id]}_end", :index => params[:index]}),
+      :week => params[:index])
+-%>
+<%
+    end
+-%>
+</p>
 <br/>
 <div class="container tickler" id="tickler_container">
   <h2><%= @page_title -%></h2>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2908cc27..71142b67 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -321,6 +321,12 @@ en:
     click_to_update_actions: Click on a bar in the chart to update the actions below.
     no_actions_selected: There are no actions selected.
     actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions
+    actions_dow_30days_legend:
+      number_of_actions: Number of actions
+      day_of_week: Day of the week
+    actions_day_of_week_legend:
+      number_of_actions: Number of actions
+      day_of_week: Day of the week
     tod30_legend:
       number_of_actions: Number of actions
       time_of_day: Time of day
diff --git a/test/functional/stats_controller_test.rb b/test/functional/stats_controller_test.rb
index 035a48f5..d7844cb1 100755
--- a/test/functional/stats_controller_test.rb
+++ b/test/functional/stats_controller_test.rb
@@ -273,6 +273,151 @@ class StatsControllerTest < ActionController::TestCase
     assert_equal "(others)",  assigns['actions_per_context'][9]['name'], "pie slices limited to max 10; last slice contains label for others"
   end
 
+  def test_context_running_actions_data
+    login_as(:admin_user)
+    @current_user = User.find(users(:admin_user).id)
+    @current_user.todos.delete_all
+    
+    given_todos_for_stats
+
+    # When I get the chart data
+    get :context_running_actions_data
+    assert_response :success
+
+    assert_equal 4, assigns['sum'], "Four running todos in 1 context"
+    assert_equal 1, assigns['actions_per_context'].size
+
+    # Given 10 more todos in 10 different contexts
+    1.upto(10) do |i|
+      context = @current_user.contexts.create!(:name => "context #{i}")
+      @current_user.todos.create!(:description => "created today with new context #{i}", :context => context)
+    end
+
+    # When I get the chart data
+    get :context_running_actions_data
+    assert_response :success
+
+    assert_equal 14, assigns['sum'], "added 10 todos"
+    assert_equal 10, assigns['actions_per_context'].size, "pie slices limited to max 10"
+    assert_equal  2, assigns['actions_per_context'][9]['total'], "pie slices limited to max 10; last pie contains sum of rest"
+    assert_equal "(others)",  assigns['actions_per_context'][9]['name'], "pie slices limited to max 10; last slice contains label for others"
+  end
+  
+  def test_actions_day_of_week_all_data
+    login_as(:admin_user)
+    @current_user = User.find(users(:admin_user).id)
+    @current_user.todos.delete_all
+    
+    given_todos_for_stats
+
+    # When I get the chart data
+    get :actions_day_of_week_all_data
+    assert_response :success
+
+    # FIXME: testdata is relative from today, so not stable to test on day_of_week
+    # trivial not_nil tests
+    assert_not_nil assigns['max']
+    assert_not_nil assigns['actions_creation_day_array']
+    assert_not_nil assigns['actions_completion_day_array']
+  end
+
+  def test_actions_day_of_week_30days_data
+    login_as(:admin_user)
+    @current_user = User.find(users(:admin_user).id)
+    @current_user.todos.delete_all
+    
+    given_todos_for_stats
+
+    # When I get the chart data
+    get :actions_day_of_week_30days_data
+    assert_response :success
+
+    # FIXME: testdata is relative from today, so not stable to test on day_of_week
+    # trivial not_nil tests
+    assert_not_nil assigns['max']
+    assert_not_nil assigns['actions_creation_day_array']
+    assert_not_nil assigns['actions_completion_day_array']
+  end
+
+  def test_actions_time_of_day_all_data
+    login_as(:admin_user)
+    @current_user = User.find(users(:admin_user).id)
+    @current_user.todos.delete_all
+    
+    given_todos_for_stats
+
+    # When I get the chart data
+    get :actions_time_of_day_all_data
+    assert_response :success
+
+    # FIXME: testdata is relative from today, so not stable to test on day_of_week
+    # for now just trivial not_nil tests
+    assert_not_nil assigns['max']
+    assert_not_nil assigns['actions_creation_hour_array']
+    assert_not_nil assigns['actions_completion_hour_array']
+  end
+  
+  def test_show_selected_actions_from_chart_avrt
+    login_as(:admin_user)
+    @current_user = User.find(users(:admin_user).id)
+    @current_user.todos.delete_all
+    
+    given_todos_for_stats
+
+    # When I get the chart data
+    get :show_selected_actions_from_chart, {:id => "avrt", :index => 1}
+    assert_response :success
+
+    assert_equal false, assigns['further']  # not at end
+    assert_equal 0, assigns['count']
+  end
+
+  def test_show_selected_actions_from_chart_avrt_end
+    login_as(:admin_user)
+    @current_user = User.find(users(:admin_user).id)
+    @current_user.todos.delete_all
+    
+    given_todos_for_stats
+
+    # When I get the chart data
+    get :show_selected_actions_from_chart, {:id => "avrt_end", :index => 1}
+    assert_response :success
+
+    assert assigns['further']  # at end
+    assert_equal 2, assigns['count']
+  end
+
+  def test_show_selected_actions_from_chart_art
+    login_as(:admin_user)
+    @current_user = User.find(users(:admin_user).id)
+    @current_user.todos.delete_all
+    
+    given_todos_for_stats
+
+    # When I get the chart data
+    get :show_selected_actions_from_chart, {:id => "art", :index => 1}
+    assert_response :success
+
+    assert_equal false, assigns['further']  # not at end
+    assert_equal 0, assigns['count']
+  end
+
+  def test_show_selected_actions_from_chart_art_end
+    login_as(:admin_user)
+    @current_user = User.find(users(:admin_user).id)
+    @current_user.todos.delete_all
+    
+    given_todos_for_stats
+
+    # When I get the chart data
+    get :show_selected_actions_from_chart, {:id => "art_end", :index => 1}
+    assert_response :success
+
+    assert assigns['further']  # at end
+    assert_equal 2, assigns['count']
+  end
+
+
   private
   
   def given_todos_for_stats