diff --git a/README b/README
index 6982299..1321019 100644
--- a/README
+++ b/README
@@ -338,7 +338,6 @@ Battery widget
 CPU usage widget
   cpuwidget = awful.widget.graph()
   cpuwidget:set_width(50)
-  cpuwidget:set_max_value(100)
   cpuwidget:set_background_color('#494B4F')
   cpuwidget:set_color('#FF5656')
   cpuwidget:set_gradient_colors({ '#FF5656', '#88A175', '#AECF96' })
diff --git a/init.lua b/init.lua
index 3e8b654..19976aa 100644
--- a/init.lua
+++ b/init.lua
@@ -62,13 +62,13 @@ widgets = {}
 -- }}}
 
 -- {{{ Widget types
-for w, i in pairs(_M) do
+for i, w in pairs(_M) do
     -- Ensure we don't call ourselves
-    if i and i ~= _M and type(i) == "table" then
+    if w and w ~= _M and type(w) == "table" then
         -- Ignore the function table and helpers
-        if w ~= "widgets" and w ~= "helpers" then
+        if i ~= "widgets" and i ~= "helpers" then
             -- Place widgets in the namespace table
-            widgets[w] = i
+            widgets[i] = w
         end
     end
 end
@@ -257,7 +257,7 @@ function update(widget, reg, disablecache)
     end
 
     if widget.add_value ~= nil then
-        widget:add_value(tonumber(data))
+        widget:add_value(tonumber(data) / 100)
     elseif widget.set_value ~= nil then
         widget:set_value(tonumber(data) / 100)
     else