diff --git a/ChangeLog b/ChangeLog
index a383be8e..70e27812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4602,6 +4602,7 @@ v0.33.20        10-Feb-2002
 		Added 2 functions to return the OS name and CPU family.
 		Added a function to return the right tearline.
 		Added support for ext3 filesystem in diskspace check.
+		Fixed lharc archives return code to LHA.
 
 	mbsetup:
 		In message groups added default settings for auto area
@@ -4658,6 +4659,7 @@ v0.33.20        10-Feb-2002
 		defaults from the mailgroup.
 		Experimental patch in mkftnhdr to create a To address in news
 		articles where a Reply-To: header is present.
+		It was not possible to disconnect file areas.
 
 	mball:
 		Will not crash anymore when it needs more then 10 minutes to
@@ -4692,6 +4694,7 @@ v0.33.20        10-Feb-2002
 		Added support for external message editor written by Redy.
 		Doors are now passed the parameter to display a prompt after
 		the door or return silently.
+		Fixed lharc file return code to LHA.
 
 	mbnewusr:
 		New users have the default internal fullscreen editor.
diff --git a/TODO b/TODO
index fdce00aa..5fe1dae7 100644
--- a/TODO
+++ b/TODO
@@ -95,6 +95,8 @@ mbnewusr:
 mbsetup:
 	U: PickAka function lets mbsetup crash if domain is 12 characters
 
+	U: When moving an JAM messagebase, check filefind records.
+
 	N: Put ZMH fields in the network setup for each zone.
 
 	L: Generate crossreference document:
diff --git a/lang/german.txt b/lang/german.txt
index fc55f507..edd2f9bb 100644
--- a/lang/german.txt
+++ b/lang/german.txt
@@ -370,8 +370,8 @@ UA|Aufgelistete (U)mschalten, alle (A)bwaehlen, <ENTER> um fortzufahren:
 JN|Sind Sie sicher? [J/n]: 
 |Check auf neue Dateien ist jetzt AN
 |Check auf neue Dateien ist jetzt AUS
-|Now using the
-123|Select: 1) Line editor, 2) Fullscreen editor, 3) External editor 
+|Sie verwenden jetzt den 
+123|Auswahl: 1) Zeilen-Editor, 2) Vollbild-Editor, 3) Externer Editor 
 |Es liegen keine Mitteilungen zum Herunterladen vor!
 |Weiter mit <Enter> ... 
 |Zentrieren
@@ -385,9 +385,9 @@ JN|Sind Sie sicher? [J/n]:
 |Beispiel:  "Gerhard Schroeder",  login = gschroed
 |Ihr gewuenschter Anmeldename: 
 |Dieser Anmeldename existiert bereits, bitte waehlen Sie einen anderen.
-|Line
-|Fullscreen
-|External
+|Zeilen-
+|Vollbild-
+|Externen 
 |Editor
 |Neu    
 |Local    
diff --git a/lib/unpacker.c b/lib/unpacker.c
index 0c779716..f3023c15 100644
--- a/lib/unpacker.c
+++ b/lib/unpacker.c
@@ -58,11 +58,10 @@ char *unpacker(char *fn)
 
 	if (memcmp(buf,"PK",2) == 0)         return (char *)"ZIP";
 	if (*buf == 0x1a)                    return (char *)"ARC";
-	if (memcmp(buf+2,"-l",2) == 0)       return (char *)"LZH";
+	if (memcmp(buf+2,"-l",2) == 0)       return (char *)"LHA";
 	if (memcmp(buf,"ZOO",3) == 0)        return (char *)"ZOO";
 	if (memcmp(buf,"`\352",2) == 0)      return (char *)"ARJ";
 	if (memcmp(buf,"Rar",3) == 0)        return (char *)"RAR";
-//	if (memcmp(buf, ";A ",3) == 0)       return (char *)"ASC";
 
 	Syslog('p', "Unknown compress scheme in file %s", fn);
 	return NULL;
diff --git a/mbfido/filemgr.c b/mbfido/filemgr.c
index 901a4514..6d0f51ac 100644
--- a/mbfido/filemgr.c
+++ b/mbfido/filemgr.c
@@ -595,7 +595,7 @@ void F_Disconnect(faddr *t, char *Area, FILE *tmp)
 	return;
     }
 
-    if (!TicSystemConnect(&Sys, FALSE)) {
+    if (TicSystemConnect(&Sys, FALSE)) {
 
 	/*
 	 * Make sure to write an overview afterwards
diff --git a/mbfido/ptic.c b/mbfido/ptic.c
index f6a95431..3a2d5d1d 100644
--- a/mbfido/ptic.c
+++ b/mbfido/ptic.c
@@ -127,6 +127,11 @@ int ProcessTic(fa_list *sbl)
 	if (TIC.TicIn.Size) {
 		if (TIC.TicIn.Size != TIC.FileSize)
 			WriteError("Size is %ld, expected %ld", TIC.FileSize, TIC.TicIn.Size);
+	} else {
+		/*
+		 * No filesize in TIC file, add filesize.
+		 */
+		TIC.TicIn.Size = TIC.FileSize;
 	}
 
 	if (TIC.Crc_Int) {
@@ -155,6 +160,7 @@ int ProcessTic(fa_list *sbl)
 		return 1;
 	}
 
+
 	if ((tic.Secure) && (!TIC.TicIn.Hatch)) {
 		First = TRUE;
 		while (GetTicSystem(&Link, First)) {
@@ -443,6 +449,7 @@ int ProcessTic(fa_list *sbl)
 		}
 
 		if (!getarchiver(unarc)) {
+			WriteError("Can't get archiver for %s", unarc);
 			chdir(TIC.Inbound);
 			free(Temp);
 			return 1;
diff --git a/mbsebbs/filesub.c b/mbsebbs/filesub.c
index 74ba3a87..fd3478d7 100644
--- a/mbsebbs/filesub.c
+++ b/mbsebbs/filesub.c
@@ -711,7 +711,7 @@ char *GetFileType(char *fn)
 	 */
  	if (memcmp(buf, "PK\003\004", 4) == 0)		return (char *)"ZIP";
 	if (*buf == 0x1a)				return (char *)"ARC";
-	if (memcmp(buf+2, "-l", 2) == 0)		return (char *)"LZH";
+	if (memcmp(buf+2, "-l", 2) == 0)		return (char *)"LHA";
 	if (memcmp(buf, "ZOO", 3) == 0)			return (char *)"ZOO";
 	if (memcmp(buf, "`\352", 2) == 0)		return (char *)"ARJ";
 	if (memcmp(buf, "Rar!", 4) == 0)		return (char *)"RAR";
@@ -770,6 +770,7 @@ int ImportFile(char *fn, int Area, int fileid, time_t iTime, off_t Size)
 	if ((file_mv(temp1, temp))) {
 		WriteError("$Can't move %s to %s", fn, area.Path);
 	} else {
+		chmod(temp, 0664);
 		if (Addfile(fn, Area, fileid)) {
 
 			ReadExitinfo();
diff --git a/script/Makefile b/script/Makefile
index 01a84697..895d76a3 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -38,6 +38,18 @@ install:
 			${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 hatch       ${BINDIR} ; \
 			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 hatch       ${BINDIR}" ; \
 		fi
+		@if [ -x /usr/bin/joe ]; then \
+			echo "Making symlinks for joe's editor" ; \
+			ln -s /usr/bin/joe /usr/bin/bbsjoe ; \
+			ln -s /usr/bin/joe /usr/bin/bbsjmacs ; \
+		fi
+		@if [ -d /usr/lib/joe ]; then \
+			echo "Installing joerc files for MBSE BBS" ; \
+			${INSTALL} -c -o root -g root -m 0644 bbsjoerc   /usr/lib/joe ; \
+			echo "${INSTALL} -c -o root -g root -m 0644 bbsjoerc   /usr/lib/joe" ; \
+			${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc /usr/lib/joe ; \
+			echo "${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc /usr/lib/joe" ; \
+		fi
 		${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 bbsdoor.sh  ${BINDIR}
 		${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 rundoor.sh  ${BINDIR}
 		@bash ./installinit.sh