diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7e6e28c5..d5a9032d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -6,6 +6,8 @@ CONTRIBUTORS. See ChangeLog also
   - improved/fixed selections
 - Lotzi Boloni <boloni@cs.purdue.edu>
   - Fast switch between sessions with the same schema.
+  -Toolbar for switch between sessions
+  -Renaming sessions
 - Matthias Ettrich <ettrich@kde.org>
   - most of main.C donated via kvt.
   - rework of the session management
diff --git a/include/main.h b/include/main.h
index cd7b919b..64ad2d9c 100644
--- a/include/main.h
+++ b/include/main.h
@@ -47,7 +47,8 @@ private slots:
   void configureRequest(TEWidget*,int,int,int);
 
   void scrollbar_menu_activated(int item);
-  void activateSession(int);
+  void activateSession();
+
   void doneSession(TESession*,int);
   void opt_menu_activated(int item);
   void font_menu_activated(int item);
@@ -77,6 +78,8 @@ private slots:
 
   void setSchema(int n);
   void sendSignal(int n);
+  void slotToggleToolbar();
+  void slotRenameSession();
 
 private:
 
@@ -118,6 +121,7 @@ private:
   QPopupMenu* m_size;
   QPopupMenu* m_drop;
 //
+  KToggleAction *showToolbar;
   bool        b_menuvis;
   bool        b_scroll;
   bool        b_framevis;
diff --git a/src/main.C b/src/main.C
index 73dbc118..d281b5ab 100644
--- a/src/main.C
+++ b/src/main.C
@@ -991,6 +991,7 @@ void Konsole::doneSession(TESession* s, int )
   ra->unplug(toolBar());
   session2action.remove(s);
   action2session.remove(ra);
+  delete ra; // will the toolbar die?
 
   s->setConnect(FALSE);