diff --git a/setup.py b/setup.py
index d2059f8..e52b072 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,12 @@ setuptools.setup(
     long_description=long_description,
     long_description_content_type='text/markdown',
     url='https://gitlab.com/Rigil-Kent/yoink',
+    packages=setuptools.find_packages(),
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+    ],
     entry_points={
         'console_scripts': [
             'yoink = yoink.cli:yoink'
diff --git a/yoink/cli.py b/yoink/cli.py
index dcb6277..a2a0275 100644
--- a/yoink/cli.py
+++ b/yoink/cli.py
@@ -1,6 +1,8 @@
+from email.policy import default
 import os
 import sys
 import click
+from click_default_group import DefaultGroup
 
 from yoink.common import  app_root, library_path, config_path
 from yoink.comic import Comic
@@ -9,7 +11,7 @@ from yoink.comic import Comic
 
 queue = []
 
-@click.group()
+@click.group(cls=DefaultGroup, default='init', default_if_no_args=True)
 @click.option('-c', '--comic', help='Download a Comic file')
 @click.option('-t', '--torrent', help='Download a Torrent')
 def yoink(comic, torrent):