diff --git a/BUGS b/BUGS
index c80546b2..e143991b 100644
--- a/BUGS
+++ b/BUGS
@@ -7,8 +7,6 @@ Newly added
 - wmaker will not stop managing a screen even if another window manager
   requests that, through the ICCCM 2.0 manager selection stuff
 - stacking code is buggy (or XFree is buggy)
-- after restart focus is losed or switched to another window. May be related
-  to the one above.
 - save session doesnt work on some platforms (Alpha and Sparc)
 - texture pixmaps are being incorrectly freed somewhere. Either
   fix bug (to support broken MetroX servers) or remove all useless references
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index 5146254c..476f04c4 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -732,8 +732,6 @@ void WMSetViewDragDestinationProcs(WMView *view, WMDragDestinationProcs *procs);
 
 /* ....................................................................... */
 
-//Bool WMHasAntialiasingSupport(WMScreen *scrPtr);
-
 Bool WMIsAntialiasingEnabled(WMScreen *scrPtr);
 
 /* ....................................................................... */
diff --git a/WINGs/WINGs/WINGsP.h b/WINGs/WINGs/WINGsP.h
index 82467f8a..c442c2c8 100644
--- a/WINGs/WINGs/WINGsP.h
+++ b/WINGs/WINGs/WINGsP.h
@@ -130,31 +130,6 @@ struct W_DraggingInfo {
     W_DragDestinationInfo* destInfo; /* infos needed by destination */
 } W_DraggingInfo;
 
-/* original
-struct W_DraggingInfo {
-    Window destinationWindow;
-    Window sourceWindow;
-
-    WMPoint location;
-
-    unsigned sourceOperation;
-    WMPixmap *image;
-    WMPoint imageLocation;
-
-    char **types;
-
-    Time timestamp;
-
-    int protocolVersion;
-
-    // should be treated as internal data
-    WMView *sourceView;
-    WMView *destView;
-    WMSize mouseOffset;
-    unsigned finished:1;
-};
-*/
-
 
 typedef struct W_Screen {
     Display *display;
diff --git a/WINGs/connection.c b/WINGs/connection.c
index 9207e900..30899931 100644
--- a/WINGs/connection.c
+++ b/WINGs/connection.c
@@ -176,8 +176,8 @@ sendTimeout(void *cdata)
         clearOutputQueue(cPtr);
         cPtr->state = WCTimedOut;
         cPtr->timeoutState = WCTWhileSending;
-        // should we close it no matter what (after calling the didTimeout
-        // delegate)? -Dan
+        /* // should we close it no matter what (after calling the didTimeout
+           // delegate)? -Dan */
         if (cPtr->delegate && cPtr->delegate->didTimeout) {
             (*cPtr->delegate->didTimeout)(cPtr->delegate, cPtr);
         } else {
diff --git a/WINGs/dragsource.c b/WINGs/dragsource.c
index 3b26499c..7614f463 100644
--- a/WINGs/dragsource.c
+++ b/WINGs/dragsource.c
@@ -425,8 +425,9 @@ sendEnterMessage(WMDraggingInfo *info)
 }
 
 
+/*
 // this functon doesn't return something in all cases.
-// control reaches end of non-void function. fix this -Dan
+// control reaches end of non-void function. fix this -Dan */
 static Bool
 sendPositionMessage(WMDraggingInfo *info, WMPoint *mousePos)
 {
diff --git a/WINGs/wapplication.c b/WINGs/wapplication.c
index 43298acb..23ee8de6 100644
--- a/WINGs/wapplication.c
+++ b/WINGs/wapplication.c
@@ -35,7 +35,6 @@ WMInitializeApplication(char *applicationName, int *argc, char **argv)
     assert(argv!=NULL);
     assert(applicationName!=NULL);
 
-    /* // TODO: check if to move inside #ifdef I18N */
     setlocale(LC_ALL, "");
 
 #ifdef I18N
diff --git a/WINGs/wfontpanel.c b/WINGs/wfontpanel.c
index 2766e9bd..a98a23c7 100644
--- a/WINGs/wfontpanel.c
+++ b/WINGs/wfontpanel.c
@@ -374,7 +374,7 @@ WMSetFontPanelFont(WMFontPanel *panel, char *fontName)
     } else {
         /* maybe its proper xlfd and we can convert it to an FcPattern */
         pattern = XftXlfdParse(fontName, False, False);
-        //FcPatternPrint(pattern);
+        /*//FcPatternPrint(pattern);*/
     }
 
     if (!pattern)
diff --git a/WINGs/wtext.c b/WINGs/wtext.c
index fe9cbd27..b409d30c 100644
--- a/WINGs/wtext.c
+++ b/WINGs/wtext.c
@@ -4019,7 +4019,7 @@ WMGetTextSelectionFont(WMText *tPtr)
 void
 WMSetTextSelectionUnderlined(WMText *tPtr, int underlined)
 {
-    // check this
+    /* // check this */
     if (underlined!=0 && underlined!=1)
         return;
 
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index 8f3ad342..891f2d88 100644
--- a/WPrefs.app/Configurations.c
+++ b/WPrefs.app/Configurations.c
@@ -408,7 +408,7 @@ createPanel(Panel *p)
                               "for actions like shading and closing a window.\n"
                               "You will need a module distributed separately\n"
                               "for this. You can get it at:\n"
-                              "http://shadowmere.student.utwente.nl/"),
+                              "http://largo.windowmaker.org/files.php#WSoundServer"),
                             WMWidgetView(panel->sfxB));
 
     panel->noteL = WMCreateLabel(panel->animF);
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index 9f04ee43..565be3dc 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -53,7 +53,6 @@ showData(_Panel *panel)
     WMSetButtonSelected(panel->swi[3], GetBoolForKey("UseSaveUnders"));
     WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill"));
     WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking"));
-    //if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
     WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText"));
 }
 
@@ -81,7 +80,6 @@ createPanel(Panel *p)
     WMSetButtonText(panel->swi[5], _("Disable selection animation for selected icons."));
     WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart)."));
 
-    //if (!WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
     WMSetButtonEnabled(panel->swi[6], True);
 
     WMRealizeWidget(panel->box);
@@ -104,7 +102,6 @@ storeDefaults(_Panel *panel)
     SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders");
     SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill");
     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking");
-    //if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
     SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText");
 }
 
diff --git a/WPrefs.app/FontSimple.c b/WPrefs.app/FontSimple.c
index 0b1d8605..3cf80100 100644
--- a/WPrefs.app/FontSimple.c
+++ b/WPrefs.app/FontSimple.c
@@ -478,7 +478,7 @@ selectedOption(WMWidget *w, void *data)
                 name= "sans serif";
 
             found= 0;
-            // select family
+            /* select family */
             for (i= 0; i < WMGetListNumberOfRows(panel->familyL); i++)
             {
                 WMListItem *item= WMGetListItem(panel->familyL, i);
@@ -496,7 +496,7 @@ selectedOption(WMWidget *w, void *data)
                 WMSelectListItem(panel->familyL, -1);
             selectedFamily(panel->familyL, panel);
             
-            // select style
+            /* select style */
             if (FcPatternGetInteger(pat, FC_WEIGHT, 0, &weight) != FcResultMatch)
                 weight= FC_WEIGHT_NORMAL;
             if (FcPatternGetInteger(pat, FC_WIDTH, 0, &width) != FcResultMatch)
@@ -681,7 +681,7 @@ createPanel(Panel *p)
     label = createListLabel(scr, vbox, _("Family"));
     WMAddBoxSubview(vbox, WMWidgetView(label), False, True, 20, 0, 2);
 
-    // family
+    /* family */
     panel->familyL = WMCreateList(vbox);
     WMAddBoxSubview(vbox, WMWidgetView(panel->familyL), True, True, 0, 0, 0);
     if (panel->fonts)
diff --git a/src/dock.c b/src/dock.c
index 652c31e9..df173a84 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -338,10 +338,10 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
     Bool collapsed = clipIcon->dock->collapsed;
 #endif
 
-    //if (!clipIcon->dock->collapsed)
-    //    color = scr->clip_title_color[CLIP_NORMAL];
-    //else
-    //    color = scr->clip_title_color[CLIP_COLLAPSED];
+    /*if (!clipIcon->dock->collapsed)
+        color = scr->clip_title_color[CLIP_NORMAL];
+    else
+        color = scr->clip_title_color[CLIP_COLLAPSED];*/
     color = scr->clip_title_color[CLIP_NORMAL];
 
     XSetForeground(dpy, gc, WMColorPixel(color));
diff --git a/src/window.c b/src/window.c
index 63a68c4e..ec936b2e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -894,7 +894,7 @@ wManageWindow(WScreen *scr, Window window)
 
 #define ADEQUATE(x) ((x)!=None && (x)!=wwin->client_win && (x)!=fPtr->leader)
 
-        // only enter here if PropGetWMClass() succeds
+        /* // only enter here if PropGetWMClass() succeds */
         PropGetWMClass(wwin->main_window, &class, &instance);
         buffer = StrConcatDot(instance, class);
 
diff --git a/src/wmspec.c b/src/wmspec.c
index 503bfc0d..f6c52109 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -944,7 +944,7 @@ getWindowLayer(WWindow * wwin)
                 layer = WMFullscreenLevel;
             }
         }
-        //layer = WMPopUpLevel;
+        /* //layer = WMPopUpLevel; // this seems a bad idea -Dan */
     } else if (wwin->type == net_wm_window_type_normal) {
     }
 
@@ -1157,8 +1157,10 @@ handleWindowType(WWindow * wwin, Atom type, int *layer)
         wwin->client_flags.no_appicon = 1;
         wwin->flags.net_skip_pager = 1;
     } else if (type == net_wm_window_type_dialog) {
+        /* These also seem a bad idea in our context -Dan
         // wwin->client_flags.skip_window_list = 1;
         // wwin->client_flags.no_appicon = 1;
+        */
     } else if (type == net_wm_window_type_normal) {
     } else {
         ret = False;
diff --git a/src/xinerama.c b/src/xinerama.c
index 7be437b4..23ec7ac1 100644
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -236,43 +236,43 @@ wGetHeadForWindow(WWindow *wwin)
 
 
 /*
- int
- wGetHeadForPoint(WScreen *scr, WMPoint point, int *flags)
- {
- int i;
+int
+wGetHeadForPoint(WScreen *scr, WMPoint point, int *flags)
+{
+    int i;
 
- // paranoia
- if (flags == NULL) {
- static int tmp;
- flags = &tmp;
- }
- *flags = XFLAG_NONE;
+    // paranoia
+    if (flags == NULL) {
+        static int tmp;
+        flags = &tmp;
+    }
+    *flags = XFLAG_NONE;
 
- for (i = 0; i < scr->xine_info.count; i++) {
- #if 0
- int yy, xx;
+    for (i = 0; i < scr->xine_info.count; i++) {
+#if 0
+        int yy, xx;
 
- xx = scr->xine_info.screens[i].pos.x + scr->xine_info.screens[i].size.width;
- yy = scr->xine_info.screens[i].pos.y + scr->xine_info.screens[i].size.height;
- if (point.x >= scr->xine_info.screens[i].pos.x &&
- point.y >= scr->xine_info.screens[i].pos.y &&
- point.x < xx && point.y < yy) {
- return i;
- }
- #else
- XineramaScreenInfo *xsi = &scr->xine_info.screens[i];
+        xx = scr->xine_info.screens[i].pos.x + scr->xine_info.screens[i].size.width;
+        yy = scr->xine_info.screens[i].pos.y + scr->xine_info.screens[i].size.height;
+        if (point.x >= scr->xine_info.screens[i].pos.x &&
+            point.y >= scr->xine_info.screens[i].pos.y &&
+            point.x < xx && point.y < yy) {
+            return i;
+        }
+#else
+        XineramaScreenInfo *xsi = &scr->xine_info.screens[i];
 
- if ((unsigned)(point.x - xsi->x_org) < xsi->width &&
- (unsigned)(point.y - xsi->y_org) < xsi->height)
- return i;
- #endif
- }
+        if ((unsigned)(point.x - xsi->x_org) < xsi->width &&
+            (unsigned)(point.y - xsi->y_org) < xsi->height)
+            return i;
+#endif
+    }
 
- *flags |= XFLAG_DEAD;
+    *flags |= XFLAG_DEAD;
 
- return scr->xine_primary_head;
- }
- */
+    return scr->xine_primary_head;
+}
+*/
 
 
 
diff --git a/util/convertfonts.c b/util/convertfonts.c
index 21a67f2e..80ddfc12 100644
--- a/util/convertfonts.c
+++ b/util/convertfonts.c
@@ -69,7 +69,7 @@ print_help()
     puts("");
 }
 
-// replace --sets-too with something better
+
 int
 main(int argc, char **argv)
 {
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index 3c2b6ead..7171672e 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -495,7 +495,6 @@ parseTexture(RContext *rc, char *text)
         XColor color;
         Pixmap pixmap = None;
         RImage *image = NULL;
-        //int w, h;
         int iwidth, iheight;
         RColor rcolor;
 
diff --git a/wrlib/draw.c b/wrlib/draw.c
index 1c213b0d..88921af3 100644
--- a/wrlib/draw.c
+++ b/wrlib/draw.c
@@ -279,7 +279,7 @@ clipLineInRectangle(int xmin, int ymin, int xmax, int ymax,
         } else if (ocode & RIG) {
             y = *y1 + (*y2 - *y1) * (xmax - *x1) / (*x2 - *x1);
             x = xmax;
-        } else { //if (ocode & LEF) {
+        } else { /* //if (ocode & LEF) { */
             y = *y1 + (*y2 - *y1) * (xmax - *x1) / (*x2 - *x1);
             x = xmin;
         }