diff --git a/TODO b/TODO
index 638f8ff..83ff9f2 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-  · Add Doxygen comment
+  · Add Doxygen comment <-> OK
   · Mouse bindings in the config file
   · Can change client position in the tile grid
   · Add image support <- *.xpm: Removed because bugs.
diff --git a/src/client.c b/src/client.c
index 0fba8ab..e8812d7 100644
--- a/src/client.c
+++ b/src/client.c
@@ -188,7 +188,7 @@ client_focus(Client *c)
      return;
 }
 
-/* Get Client with any window Client member {{{ */
+/* Get Client with a window */
 /** Get a client->win with a window
  * \param w Window
  * \return The client
@@ -301,7 +301,9 @@ uicb_client_kill(uicb_t cmd)
      ev.xclient.format = 32;
      ev.xclient.data.l[0] = wm_atom[WMDelete];
      ev.xclient.data.l[1] = CurrentTime;
+
      XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
+     client_unmanage(sel);
 
      return;
 }
diff --git a/src/infobar.c b/src/infobar.c
index a092424..78aed9b 100644
--- a/src/infobar.c
+++ b/src/infobar.c
@@ -137,13 +137,13 @@ infobar_destroy(void)
 
      bar_delete(infobar->bar);
      bar_delete_subwin(infobar->bar);
+     bar_delete(infobar->layout_button);
+     bar_delete_subwin(infobar->layout_button);
      for(i = 1; i < conf.ntag + 1; ++i)
      {
           bar_delete_subwin(infobar->tags[i]);
           bar_delete(infobar->tags[i]);
      }
-     bar_delete(infobar->layout_button);
-     bar_delete_subwin(infobar->layout_button);
      efree(infobar);
 
      return;