diff --git a/TODO b/TODO
index 64a16735..cc6f064b 100644
--- a/TODO
+++ b/TODO
@@ -1 +1,8 @@
 * Edit doc/terminatorrc.5 manpage to contain the information about the options
+
+* menu entry/keybinding to hightlight a term upon:
+    * command ending
+    * new text in window
+    * when a command exits, "window-title-changed" is emitted 
+      even though the actual title string do not change
+    * text-modified could be used to spy on outputs from the command
diff --git a/terminator b/terminator
index 9deb7c08..4f0e0e4a 100755
--- a/terminator
+++ b/terminator
@@ -1039,7 +1039,8 @@ class Terminator:
     """
     vertical = pos in ("top", "bottom")
     pane = (vertical) and gtk.VPaned () or gtk.HPaned ()
-    pane.handle_size = 1
+    #pane.handle_size = 1
+    
     
     # get the parent of the provided terminal
     parent   = widget.get_parent ()
@@ -1542,8 +1543,19 @@ class Terminator:
   def toggle_zoom(self, widget):
     if not self._zoomed:
       self.zoom_term (widget)
+      if self.conf.titlebars:
+        widget._titlebox.hide()
+      widget._vte.grab_focus()
     else:
       self.unzoom_term (widget)
+      if self.conf.titlebars and \
+        (\
+            len(self.term_list) > 1 \
+              or \
+            (isinstance(widget, TerminatorTerm) and isinstance(widget.get_parent(),gtk.Notebook))\
+        ):
+        widget._titlebox.show()
+      widget._vte.grab_focus()
 
   def zoom_term (self, widget):
     """Proof of concept: Maximize to full window