diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index 880bd652..af1d9395 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -2,9 +2,11 @@
 
 <FreePokerToolsConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FreePokerToolsConfig.xsd">
 
-    <general config_wrap_len="-1"   <!-- preferred max line length in this file, -1 means no max -->
-             day_start="5"          <!-- time that logical day starts, e.g. 5 means that any play 
-                                         between 00:00 and 04:59:59 counts as being on the previous day -->
+    <!-- config_wrap_len  is preferred max line length in this file, -1 means no max
+         day_start        is time that logical day starts, e.g. 5 means that any play
+                          between 00:00 and 04:59:59 counts as being on the previous day -->
+    <general config_wrap_len="-1"   
+             day_start="5"          
              />
 
     <import callFpdbHud = "True" interval = "10"  fastStoreHudCache="False" hhArchiveBase="~/.fpdb/HandHistories/" saveActions="True"></import>
diff --git a/pyfpdb/fpdb.pyw b/pyfpdb/fpdb.pyw
index 0594a805..58a1b230 100755
--- a/pyfpdb/fpdb.pyw
+++ b/pyfpdb/fpdb.pyw
@@ -714,7 +714,7 @@ class fpdb:
             self.warning_box( "There is an error in your config file\n" + self.config.file
                               + "\n\nError is:  " + str(self.config.file_error)
                             , diatitle="CONFIG FILE ERROR" )
-            exit()
+            sys.exit()
 
         log = Configuration.get_logger("logging.conf", "fpdb", log_dir=self.config.dir_log)
         print "Logfile is " + os.path.join(self.config.dir_log, self.config.log_file) + "\n"
@@ -905,7 +905,11 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         self.window.connect("destroy", self.destroy)
         self.window.set_title("Free Poker DB - v%s or higher" % (VERSION, ))
         self.window.set_border_width(1)
-        self.window.set_default_size(900,720)
+        defx, defy = 900, 720
+        sx, sy = gtk.gdk.screen_width(), gtk.gdk.screen_height()
+        if sx < defx:  defx = sx
+        if sy < defy:  defy = sy
+        self.window.set_default_size(defx, defy)
         self.window.set_resizable(True)
 
         self.main_vbox = gtk.VBox(False, 1)