diff --git a/setup.py b/setup.py
index c09998d..2e19b8e 100755
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ except:
 
 setuptools.setup(
         name='warcprox',
-        version='2.1b1.dev94',
+        version='2.2b1.dev98',
         description='WARC writing MITM HTTP/S proxy',
         url='https://github.com/internetarchive/warcprox',
         author='Noah Levitt',
diff --git a/warcprox/main.py b/warcprox/main.py
index 30f85d2..70d4079 100644
--- a/warcprox/main.py
+++ b/warcprox/main.py
@@ -81,9 +81,9 @@ def _build_arg_parser(prog=os.path.basename(sys.argv[0])):
             help='write gzip-compressed warc records')
     arg_parser.add_argument('-n', '--prefix', dest='prefix',
             default='WARCPROX', help='WARC filename prefix')
-    arg_parser.add_argument('-s', '--size', dest='size',
-            default=1000*1000*1000, type=int,
-            help='WARC file rollover size threshold in bytes')
+    arg_parser.add_argument(
+            '-s', '--size', dest='rollover_size', default=1000*1000*1000,
+            type=int, help='WARC file rollover size threshold in bytes')
     arg_parser.add_argument('--rollover-idle-time',
             dest='rollover_idle_time', default=None, type=int,
             help="WARC file rollover idle time threshold in seconds (so that Friday's last open WARC doesn't sit there all weekend waiting for more data)")
@@ -225,9 +225,7 @@ def init_controller(args):
         playback_index_db = warcprox.playback.PlaybackIndexDb(
                 args.playback_index_db_file, options=options)
         playback_proxy = warcprox.playback.PlaybackProxy(
-                server_address=(args.address, args.playback_port), ca=ca,
-                playback_index_db=playback_index_db, warcs_dir=args.directory,
-                options=options)
+                ca=ca, playback_index_db=playback_index_db, options=options)
         listeners.append(playback_index_db)
     else:
         playback_index_db = None
@@ -306,7 +304,11 @@ def main(argv=sys.argv):
 
     signal.signal(signal.SIGTERM, lambda a,b: controller.stop.set())
     signal.signal(signal.SIGINT, lambda a,b: controller.stop.set())
-    signal.signal(signal.SIGQUIT, dump_state)
+    try:
+        signal.signal(signal.SIGQUIT, dump_state)
+    except AttributeError:
+        # SIGQUIT does not exist on some platforms (windows)
+        pass
 
     controller.run_until_shutdown()
 
diff --git a/warcprox/playback.py b/warcprox/playback.py
index 3ee2aaa..663e10a 100644
--- a/warcprox/playback.py
+++ b/warcprox/playback.py
@@ -210,7 +210,6 @@ class PlaybackProxyHandler(MitmProxyHandler):
 class PlaybackProxy(socketserver.ThreadingMixIn, http_server.HTTPServer):
     logger = logging.getLogger("warcprox.playback.PlaybackProxy")
 
-
     def __init__(self, ca=None, playback_index_db=None, options=warcprox.Options()):
         server_address = (options.address or 'localhost', options.playback_port if options.playback_port is not None else 8001)
         http_server.HTTPServer.__init__(self, server_address, PlaybackProxyHandler, bind_and_activate=True)
@@ -231,7 +230,7 @@ class PlaybackProxy(socketserver.ThreadingMixIn, http_server.HTTPServer):
 class PlaybackIndexDb(object):
     logger = logging.getLogger("warcprox.playback.PlaybackIndexDb")
 
-    def __init__(self, file='./warcprox.sqlite'):
+    def __init__(self, file='./warcprox.sqlite', options=warcprox.Options()):
         self.file = file
         self._lock = threading.RLock()