diff --git a/etc/ArchiveBox.conf.default b/etc/ArchiveBox.conf.default
index eed7e284..31017ce4 100644
--- a/etc/ArchiveBox.conf.default
+++ b/etc/ArchiveBox.conf.default
@@ -1,7 +1,9 @@
-# This is the default config file for new ArchiveBox projects.
-# Edit values below using INI syntax, then update your archive by running:
-#    archivebox init
-# For more options, example setups, and documentation, see:
+# This is the example default configiration file for ArchiveBox.
+# 
+# Copy example config from here into your project's ArchiveBox.conf file,
+# DO NOT EDIT THIS FILE DIRECTLY!
+#
+# See the list of all the possible options. documentation, and examples here:
 #    https://github.com/pirate/ArchiveBox/wiki/Configuration
 
 [GENERAL_CONFIG]
diff --git a/setup.py b/setup.py
index ee0f1f47..685e9003 100644
--- a/setup.py
+++ b/setup.py
@@ -62,8 +62,38 @@ setuptools.setup(
         'archivebox': ['VERSION', 'templates/*', 'templates/static/*'],
     },
     classifiers=[
+        "Development Status :: 4 - Beta",
+
+        "Topic :: Utilities",
+        "Topic :: System :: Archiving",
+        "Topic :: System :: Archiving :: Backup",
+        "Topic :: System :: Recovery Tools",
+        "Topic :: Sociology :: History",
+        "Topic :: Internet :: WWW/HTTP",
+        "Topic :: Internet :: WWW/HTTP :: Indexing/Search",
+        "Topic :: Internet :: WWW/HTTP :: WSGI",
+        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
+        "Topic :: Internet :: WWW/HTTP :: WSGI :: Server",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+
+        "Intended Audience :: Developers",
+        "Intended Audience :: Education",
+        "Intended Audience :: End Users/Desktop",
+        "Intended Audience :: Information Technology",
+        "Intended Audience :: Legal Industry",
+        "Intended Audience :: System Administrators",
+        
+        "Environment :: Console",
+        "Environment :: Web Environment",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        'Framework :: Django',
+        "Typing :: Typed",
+
         "License :: OSI Approved :: MIT License",
+        "Natural Language :: English",
         "Operating System :: OS Independent",
     ],
 )