diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index 815f7bf742582c3653d82546bc0bec6833d72b38..44c961e3593aeb7f7166d708f53f904278b35017 100644
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -131,9 +131,9 @@ deb: $(bindir)
 		$(DESTDIR)/etc/init.d/
 # default prefs file
 	install -d $(DESTDIR)/etc/pd-l2ork
-	ln -s -f $(libpddir)/default.pd-l2ork \
-		$(DESTDIR)/etc/pd-l2ork/default.pd-l2ork
-	install -p $(packages_src)/linux_make/default.pd-l2ork $(DESTDIR)$(libpddir)
+	ln -s -f $(libpddir)/default.settings \
+		$(DESTDIR)/etc/pd-l2ork/default.settings
+	install -p $(packages_src)/linux_make/default.settings $(DESTDIR)$(libpddir)
 # app window icon
 	install -p $(packages_src)/linux_make/pd-l2ork.gif $(DESTDIR)$(libpddir)
 # emacs mode for .pd files
@@ -177,7 +177,7 @@ installer_readme:
 		$(INSTALLER_README_FILE)
 
 installer_settings:
-	install -p $(packages_src)/linux_make/default.pd-l2ork $(DESTDIR)$(libpddir)
+	install -p $(packages_src)/linux_make/default.settings $(DESTDIR)$(libpddir)
 	# app window icon
 	install -p $(packages_src)/linux_make/pd-l2ork.gif $(DESTDIR)$(libpddir)
 #	install -d $(DESTDIR)/usr/share/icons/hicolor/128x128/apps
diff --git a/pd/src/pd.tk b/pd/src/pd.tk
index 4309f885410bf5fa719aefe44bc207362b819be3..dcc2a26f6899895eeab342dcad86bc3b6a8d5eb4 100644
--- a/pd/src/pd.tk
+++ b/pd/src/pd.tk
@@ -294,10 +294,10 @@ if { $tcl_platform(platform) == "windows" }  {
 	set externalsdir "$::env(HOME)/pd-l2ork-externals"
 }   
 
-proc bgerror {message} {
-	pdtk_post "\ntcl error: $message"
+#proc bgerror {message} {
+#	pdtk_post "\ntcl error: $message"
 	#puts "\033\[0;1;33mtcl error: $::errorInfo\033\[0m"
-}     
+#}     
 
 # make sure the user folder for installing externals exists
 #catch {
diff --git a/pd/src/s_file.c b/pd/src/s_file.c
index 68ad55f1f90bcf141e277ac3d40234c3817d4981..ebacc2052f877b71d7460f8fce31483beb93b489 100644
--- a/pd/src/s_file.c
+++ b/pd/src/s_file.c
@@ -6,7 +6,7 @@
  * this file implements a mechanism for storing and retrieving preferences.
  * Should later be renamed "preferences.c" or something.
  *
- * In unix this is handled by the "~/.pd-l2ork/settings" file, in windows by
+ * In unix this is handled by the "~/.pd-l2ork/user.settings" file, in windows by
  * the registry, and in MacOS by the Preferences system.
  */
 
@@ -58,11 +58,11 @@ static void sys_initloadpreferences( void)
     char default_prefs_file[FILENAME_MAX];
     struct stat statbuf;
 
-    snprintf(default_prefs_file, FILENAME_MAX, "%s/default.pd-l2ork", 
+    snprintf(default_prefs_file, FILENAME_MAX, "%s/default.settings", 
              sys_libdir->s_name);
 
     if (homedir)
-        snprintf(user_prefs_file, FILENAME_MAX, "%s/.pd-l2ork/settings", homedir);
+        snprintf(user_prefs_file, FILENAME_MAX, "%s/.pd-l2ork/user.settings", homedir);
     if (stat(user_prefs_file, &statbuf) == 0) 
         strncpy(filenamebuf, user_prefs_file, FILENAME_MAX);
     else if (stat(default_prefs_file, &statbuf) == 0)
@@ -143,7 +143,7 @@ static void sys_initsavepreferences( void)
 
     if (!homedir)
         return;
-    snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork/settings", homedir);
+    snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork/user.settings", homedir);
     filenamebuf[FILENAME_MAX-1] = 0;
     if ((sys_prefsavefp = fopen(filenamebuf, "w")) == NULL)
     {
diff --git a/pd/src/search-plugin.tcl b/pd/src/search-plugin.tcl
index 1061e8ef6ac0ff4fd387b9aad712e4224a96d8fb..4bd1a5e3fdf1bf6d55fd1e21d9c33d107131fd6c 100644
--- a/pd/src/search-plugin.tcl
+++ b/pd/src/search-plugin.tcl
@@ -236,7 +236,7 @@ proc ::dialog_search::create_dialog {mytoplevel} {
 	-anchor center -style Foo.TLabel
     text $mytoplevel.navtext -font "$searchfont -12" -height 1 -bd 0 \
         -highlightthickness 0 -bg $::pd_colors(canvas_color) \
-	-padx 8 -pady 3 -fg $::pd_colors(text)
+	-padx 8 -pady 7 -fg $::pd_colors(text)
     text $mytoplevel.resultstext \
         -yscrollcommand "$mytoplevel.yscrollbar set" \
         -bg $::pd_colors(canvas_color) -fg $::pd_colors(text) \
@@ -618,9 +618,10 @@ proc ::dialog_search::search {} {
         -mode determinate
     ttk::button $widget.bcancel -text "Cancel" -padding {0 0 0 0} \
         -command "set ::dialog_search::cancelled 1" -cursor left_ptr
+    ttk::label $widget.building_index -background white -text "  Building index for subsequent searches...  "
 #    $widget insert 1.end "    "
     $widget window create 1.end -window $widget.pbar
-    $widget insert 1.end "  Building index for subsequent searches...  "
+    $widget window create 1.end -window $widget.building_index
     $widget window create 1.end -window $widget.bcancel
     $widget configure -state disabled