diff --git a/TODO b/TODO
index c4bcfcdca..e037959c2 100644
--- a/TODO
+++ b/TODO
@@ -3,8 +3,6 @@ ToDo-List for kdvi
 
 URGENT
 
-o Default settings switch Hyperlinks OFF, this is not good.
-
 o implement SaveAs
 
 HIGHLY DESIRABLE
diff --git a/dviwin.cpp b/dviwin.cpp
index a332bdf44..d5fed7207 100644
--- a/dviwin.cpp
+++ b/dviwin.cpp
@@ -473,8 +473,6 @@ void dviWindow::mousePressEvent ( QMouseEvent * e )
 	QString locallink = hyperLinkList[i].linkText.mid(1); // Drop the '#' at the beginning
 	for(int j=0; j<numAnchors; j++) {
 	  if (locallink.compare(AnchorList_String[j]) == 0) {
-	    // @@@Currently there is no-one listening. Make sure
-	    // kviewshell has a slot for this.
 	    emit(request_goto_page(AnchorList_Page[j], AnchorList_Vert[j]));
 	    break;
 	  }
@@ -495,4 +493,4 @@ void dviWindow::mousePressEvent ( QMouseEvent * e )
     }
   }
 }
-#include "dviwin.moc"
+//#include "dviwin.moc.cpp"
diff --git a/dviwin_draw.cpp b/dviwin_draw.cpp
index 960a447fa..6bea6ceac 100644
--- a/dviwin_draw.cpp
+++ b/dviwin_draw.cpp
@@ -49,7 +49,7 @@
  *					  and Luis Miguel Silveira, MIT RLE.
  */
 
-#define DEBUG 0
+//#define DEBUG 0
 
 #include <stdlib.h>
 
diff --git a/kdvi_multipage.cpp b/kdvi_multipage.cpp
index 0a5e2eea8..c6aa7e654 100644
--- a/kdvi_multipage.cpp
+++ b/kdvi_multipage.cpp
@@ -285,6 +285,7 @@ void KDVIMultiPage::preferencesChanged()
   if ( !s.isEmpty() && s != window->fontPath() )
     window->setFontPath( s );
 
+  // Important! The default values here must be the same as in optiondialog.cpp
   int basedpi = config->readNumEntry( "BaseResolution" );
   if ( basedpi <= 0 )
     config->writeEntry( "BaseResolution", basedpi = 300 );
@@ -293,7 +294,7 @@ void KDVIMultiPage::preferencesChanged()
 
   QString mfmode =  config->readEntry( "MetafontMode" );
   if ( mfmode.isNull() )
-    config->writeEntry( "MetafontMode", mfmode = "/" );
+    config->writeEntry( "MetafontMode", mfmode = "cx" );
   if ( mfmode != window->metafontMode() )
     window->setMetafontMode( mfmode );
 
@@ -301,11 +302,11 @@ void KDVIMultiPage::preferencesChanged()
   if ( makepk != window->makePK() )
     window->setMakePK( makepk );
 
-  int showPS = config->readNumEntry( "ShowPS" );
+  int showPS = config->readNumEntry( "ShowPS", 1 );
   if (showPS != window->showPS())
     window->setShowPS(showPS);
 
-  int showHyperLinks = config->readNumEntry( "ShowHyperLinks" );
+  int showHyperLinks = config->readNumEntry( "ShowHyperLinks", 1 );
   if (showHyperLinks != window->showHyperLinks())
     window->setShowHyperLinks(showHyperLinks);
 }
diff --git a/optiondialog.cpp b/optiondialog.cpp
index 9a1c050fd..707f0339e 100644
--- a/optiondialog.cpp
+++ b/optiondialog.cpp
@@ -89,14 +89,15 @@ void OptionDialog::setup()
   config->setGroup("kdvi");
 
   // Font page
+  // Important! The default values here must be the same as in kdvi_multipage.cpp
   mFont.resolutionEdit->setText( config->readEntry( "BaseResolution", "300" ) );
-  mFont.metafontEdit->setText( config->readEntry( "MetafontMode", "/" ) );
+  mFont.metafontEdit->setText( config->readEntry( "MetafontMode", "cx" ) );
   mFont.fontPathCheck->setChecked( config->readNumEntry( "MakePK" ) );
   mFont.fontPathEdit->setText( config->readEntry( "FontPath" ) );
   fontPathCheckChanged( mFont.fontPathCheck->isChecked() );
 
   // Rendering page
-  mRender.showSpecialCheck->setChecked( config->readNumEntry( "ShowPS", 0 ) );
+  mRender.showSpecialCheck->setChecked( config->readNumEntry( "ShowPS", 1 ) );
   mRender.showHyperLinksCheck->setChecked(config->readNumEntry("ShowHyperLinks", 1)); 
 }
 
@@ -159,4 +160,4 @@ void OptionDialog::fontPathCheckChanged( bool state )
 }
 
 
-#include "optiondialog.moc"
+//#include "optiondialog.moc.cpp"
diff --git a/print.cpp b/print.cpp
index 7d7387e32..509ed41de 100644
--- a/print.cpp
+++ b/print.cpp
@@ -335,4 +335,4 @@ void Print::readConfig()
 }
 
 #undef Inherited
-#include "print.moc"
+//#include "print.moc.cpp"
diff --git a/printData.cpp b/printData.cpp
index d486447ce..be52e7a37 100644
--- a/printData.cpp
+++ b/printData.cpp
@@ -192,4 +192,4 @@ void printData::cancelPressed()
 }
 
 #undef Inherited
-#include "printData.moc"
+//#include "printData.moc.cpp"
diff --git a/printSetup.cpp b/printSetup.cpp
index 6b566c223..b73f0498b 100644
--- a/printSetup.cpp
+++ b/printSetup.cpp
@@ -94,4 +94,4 @@ void printSetup::readConfig()
 }
 
 #undef Inherited
-#include "printSetup.moc"
+//#include "printSetup.moc.cpp"
diff --git a/printSetupData.cpp b/printSetupData.cpp
index 8bf049d80..b345f15f4 100644
--- a/printSetupData.cpp
+++ b/printSetupData.cpp
@@ -157,4 +157,4 @@ void printSetupData::removePrinter()
 void printSetupData::okPressed()
 {
 }
-#include "printSetupData.moc"
+//#include "printSetupData.moc.cpp"