diff --git a/paperless.conf.example b/paperless.conf.example
old mode 100755
new mode 100644
index 0434b590d..8790dddb4
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -48,6 +48,13 @@ PAPERLESS_CONSUMPTION_DIR=""
 #PAPERLESS_STATIC_URL="/static/"
 
 
+# You can specify where the document classification model file should be
+# stored. Make sure that this file is writeable by the user executing the
+# management command "document_create_classifier" and that the path exists.
+# The default location is /models/model.pickle wwithin the install folder.
+#PAPERLESS_MODEL_FILE=/path/to/model/file
+
+
 # These values are required if you want paperless to check a particular email
 # box every 10 minutes and attempt to consume documents from there.  If you
 # don't define a HOST, mail checking will just be disabled.
@@ -69,6 +76,11 @@ PAPERLESS_EMAIL_SECRET=""
 ####                              Security                                 ####
 ###############################################################################
 
+# Controls whether django's debug mode is enabled. Disable this on production
+# systems. Debug mode is enabled by default.
+PAPERLESS_DEBUG="false"
+
+
 # Paperless can be instructed to attempt to encrypt your PDF files with GPG
 # using the PAPERLESS_PASSPHRASE specified below.  If however you're not
 # concerned about encrypting these files (for example if you have disk
diff --git a/src/manage.py b/src/manage.py
old mode 100755
new mode 100644
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index bc6f1d6bc..f37fe0b72 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -39,7 +39,7 @@ SECRET_KEY = os.getenv(
 
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = bool(os.getenv("PAPERLESS_DEBUG", "YES").lower() in ("yes", "y", "1", "t", "true"))  # NOQA
 
 LOGIN_URL = "admin:login"
 
@@ -191,7 +191,7 @@ MEDIA_URL = os.getenv("PAPERLESS_MEDIA_URL", "/media/")
 
 # Document classification models location
 MODEL_FILE = os.getenv(
-    "PAPERLESS_STATICDIR", os.path.join(BASE_DIR, "..", "models", "model.pickle"))
+    "PAPERLESS_MODEL_FILE", os.path.join(BASE_DIR, "..", "models", "model.pickle"))
 
 
 # Paperless-specific stuff