diff --git a/development.md b/development.md
index c9b5b7b8..79f91ede 100644
--- a/development.md
+++ b/development.md
@@ -2,4 +2,8 @@
 
 ## Test suite
 
-  shelltest test/scaffold.shelltest
+  shelltest tests/scaffold.shelltest
+
+## Automated builder
+
+  tests/runscaffold.sh < sqlite-input.txt
diff --git a/scaffold/Handler/Root.hs.cg b/scaffold/Handler/Root.hs.cg
index 0ef7738d..cb0375e7 100644
--- a/scaffold/Handler/Root.hs.cg
+++ b/scaffold/Handler/Root.hs.cg
@@ -2,7 +2,6 @@
 module Handler.Root where
 
 import ~sitearg~
-import Data.Text
 
 -- This is a handler function for the GET request method on the RootR
 -- resource pattern. All of your resource patterns are defined in
diff --git a/scaffold/project.hs.cg b/scaffold/project.hs.cg
index 55f9374b..a7c76af1 100644
--- a/scaffold/project.hs.cg
+++ b/scaffold/project.hs.cg
@@ -3,7 +3,7 @@ import qualified Settings as Settings
 import Settings (AppConfig(..))
 import Controller (with~sitearg~)
 import Network.Wai.Handler.Warp (run)
-import System.Console.CmdArgs
+import System.Console.CmdArgs hiding (args)
 import Data.Char (toUpper, toLower)
 
 #if PRODUCTION
@@ -15,13 +15,13 @@ import Network.Wai.Middleware.Debug (debug)
 main :: IO ()
 main = do
     args <- cmdArgs argConfig
-    appEnv <- getAppEnv args
-    config <- Settings.loadConfig appEnv
+    env <- getAppEnv args
+    config <- Settings.loadConfig env
     let c = if (port args) /= 0 then config {appPort = (port args) } else config
 #if PRODUCTION
     with~sitearg~ c $ run (appPort c)
 #else
-    hPutStrLn stderr $ (show appEnv) ++ " application launched, listening on port " ++ show (appPort c)
+    hPutStrLn stderr $ (show env) ++ " application launched, listening on port " ++ show (appPort c)
     with~sitearg~ c $ run (appPort c) . debug
 #endif