diff --git a/base b/base
index 07b6442b4..d33be25e6 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 07b6442b4cc52bfe41b64e2b5e0f528bbb11089f
+Subproject commit d33be25e6ad412bb98a6fa2ac3edf5f26d36c8ca
diff --git a/tools/benchmark.lua b/tools/benchmark.lua
new file mode 100644
index 000000000..f3f1c18c7
--- /dev/null
+++ b/tools/benchmark.lua
@@ -0,0 +1,55 @@
+-- performance benchmark utility
+-- usage: ./luajit tools/benchmark.lua test/sample.pdf
+
+require "defaults"
+package.path = "common/?.lua;rocks/share/lua/5.1/?.lua;frontend/?.lua;" .. package.path
+package.cpath = "common/?.so;common/?.dll;/usr/lib/lua/?.so;rocks/lib/lua/5.1/?.so;" .. package.cpath
+
+local DataStorage = require("datastorage")
+--G_reader_settings = require("docsettings"):open(".reader")
+G_reader_settings = require("luasettings"):open(
+    DataStorage:getDataDir().."/settings.reader.lua")
+
+-- global einkfb for Screen (do not show SDL window)
+einkfb = require("ffi/framebuffer")
+einkfb.dummy = true
+
+local DocumentRegistry = require("document/documentregistry")
+local Koptinterface = require("document/koptinterface")
+local util = require("ffi/util")
+local DEBUG = require("dbg")
+DEBUG:turnOn()
+
+DEBUG("args", arg)
+
+function logDuration(filename, pageno, dur)
+    local file = io.open(filename, "a+")
+    if file then
+        file:write(string.format("%s\t%s\n", pageno, dur))
+        file:close()
+    end
+end
+
+function doAutoBBox(doc, page)
+    Koptinterface:getAutoBBox(doc, page)
+end
+
+function doReflow(doc, page)
+    Koptinterface:getCachedContext(doc, page)
+end
+
+function benchmark(filename, doForOnePage)
+    local doc = DocumentRegistry:openDocument(filename)
+    for i = 1, doc:getPageCount() do
+        local secs, usecs = util.gettime()
+        doForOnePage(doc, i)
+        local nsecs, nusecs = util.gettime()
+        local dur = nsecs - secs + (nusecs - usecs) / 1000000
+        DEBUG("duration for page", i, dur)
+        logDuration("benchmark.txt", i, dur)
+    end
+end
+
+--benchmark(arg[1], doAutoBBox)
+benchmark(arg[1], doReflow)
+
diff --git a/tools/kobo_touch_probe.lua b/tools/kobo_touch_probe.lua
index 0c8ea8f33..71aa2ad8c 100755
--- a/tools/kobo_touch_probe.lua
+++ b/tools/kobo_touch_probe.lua
@@ -5,15 +5,14 @@ require "defaults"
 package.path = "common/?.lua;rocks/share/lua/5.1/?.lua;frontend/?.lua;" .. package.path
 package.cpath = "common/?.so;common/?.dll;/usr/lib/lua/?.so;rocks/lib/lua/5.1/?.so;" .. package.cpath
 
-local DocSettings = require("docsettings")
+local DataStorage = require("datastorage")
 local _ = require("gettext")
 
 -- read settings and check for language override
 -- has to be done before requiring other files because
 -- they might call gettext on load
-if G_reader_settings == nil then
-    G_reader_settings = DocSettings:open(".reader")
-end
+G_reader_settings = require("luasettings"):open(
+    DataStorage:getDataDir().."/settings.reader.lua")
 local lang_locale = G_reader_settings:readSetting("language")
 if lang_locale then
     _.changeLang(lang_locale)
diff --git a/tools/trace_require.lua b/tools/trace_require.lua
old mode 100644
new mode 100755