     (when display-in-minibuffer (message str))
     (set-buffer ros-events-buffer)
     (goto-char (point-max))
-    (princ (format "\n%s: %s" (float-time) str) ros-events-buffer)
+    (princ (format "\n[%s] %s" (substring (current-time-string) 11 19) str) ros-events-buffer)
     )
   )
 
-(defun rosemacs/display-event-buffer ()
+(defun rosemacs/display-event-buffer (&optional other-window)
   (interactive)
-  (display-buffer ros-events-buffer))
+  (if other-window
+      (display-buffer ros-events-buffer)
+    (switch-to-buffer ros-events-buffer)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Keymap

          (princ (format "%s\n" n) ros-node-buffer))))))


(defun rosemacs/display-nodes ()
  (interactive)
  (display-buffer (get-buffer-create "*ros-nodes*")))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

                  (ros-launch-mode 1)
                  (rosemacs/relaunch (current-buffer)))
                
                (if other-window (display-buffer buf) (switch-to-buffer buf))
                buf)))
	(error "Did not find %s in the ros package list." package-name)))))

