diff --git a/ChangeLog b/ChangeLog
index d1d49c0..0f3002d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-06  Glynn Foster  <glynn.foster@sun.com>
+
+	* src/main.c: Update commandline error message, needs updating
+	of translations.
+	* src/tree.c: Remove some commented out code.
+	* src/zenity.glade: Updated error and info dialogs to do 
+	wrapping.
+
 2003-05-06  Glynn Foster  <glynn.foster@sun.com>
 
 	* src/tree.c: Fix up the stdin list dialog stuff.
diff --git a/src/main.c b/src/main.c
index 2f97d1c..0a2d312 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1000,18 +1000,19 @@ main (gint argc, gchar **argv) {
     /*nothing*/;
 
   if (nextopt != -1) {
-    g_printerr (_("%s in an invalid option for this dialog. See zenity --help for more details\n"),
+    g_printerr (_("%s in an invalid option. See zenity --help for more details\n"),
                   poptBadOption (ctx, 0));
     zenity_free_parsing_options (); 
     exit (-1); 
   }
   gtk_init (&argc, &argv);
 
+  /* 
   if (argc < 2) {
     g_printerr (_("You must specify more arguments. See zenity --help for more details\n"));
     zenity_free_parsing_options ();
     exit (-1);
-  }
+  } */
 
   switch (results->mode) {
     case MODE_CALENDAR:
diff --git a/src/tree.c b/src/tree.c
index 5b32fd1..b94f634 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -287,19 +287,11 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
   n_columns = g_slist_length (tree_data->columns);
 
   if (n_columns == 0) {
-    g_printerr (_("No column titles specified for --list\n")); 
+    g_printerr (_("No column titles specified for List dialog.\n")); 
     data->exit_code = -1;
     return;
   }
 
-  /*
-  if (tree_data->data == NULL) {
-    g_printerr (_("No contents specified for --list\n"));
-    data->exit_code = -1;
-    return;
-  }
-  */
-
   glade_xml_signal_autoconnect (glade_dialog);
 
   dialog = glade_xml_get_widget (glade_dialog, "zenity_tree_dialog");
diff --git a/src/zenity.glade b/src/zenity.glade
index 8a4999c..482f152 100644
--- a/src/zenity.glade
+++ b/src/zenity.glade
@@ -815,7 +815,7 @@
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
+		  <property name="wrap">True</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
@@ -1058,7 +1058,7 @@
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
+		  <property name="wrap">True</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>