diff --git a/libraries/activatorTools.py b/libraries/activatorTools.py
index b70a434a0..c5cf2eea5 100644
--- a/libraries/activatorTools.py
+++ b/libraries/activatorTools.py
@@ -127,7 +127,7 @@ def sync(options, justTidy = False):
 		activatorLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"sync: removing (local) file "+file)
 		print_info(green(" * ")+red("Package file: ")+bold(file)+red(" removed successfully from ")+bold(etpConst['packagesbindir']))
 		os.remove(etpConst['packagesbindir']+"/"+file)
-	ftp.closeFTPConnection()
+	ftp.closeConnection()
 	
     print_info(green(" * ")+red("Syncronization across mirrors completed."))
 
@@ -196,7 +196,7 @@ def packages(options):
 	        ftp.setCWD(etpConst['binaryurirelativepath'])
 	        remotePackages = ftp.listDir()
 	        remotePackagesInfo = ftp.getRoughList()
-	        ftp.closeFTPConnection()
+	        ftp.closeConnection()
 
 	        print_info(green(" * ")+yellow("Remote statistics"))
 	        remoteCounter = 0
@@ -533,7 +533,7 @@ def packages(options):
 			    rcmd5 = ftp.uploadFile(hashfile,ascii = True)
 			    # verify upload using remoteTools
 			    print_info(counterInfo+red("   -> Verifying ")+green(item[0]+etpConst['packageshashfileext'])+bold(" checksum")+red(" (if supported)"), back = True)
-			    ck = remoteTools.getRemotePackageChecksum(extractFTPHostFromUri(uri),item[0])
+			    ck = remoteTools.getRemotePackageChecksum(extractFTPHostFromUri(uri),item[0]+etpConst['packageshashfileext'])
 			    if (ck == None):
 				print_warning(counterInfo+red("   -> Digest verification of ")+green(item[0]+etpConst['packageshashfileext'])+bold(" not supported"))
 				ckOk = True
@@ -558,7 +558,7 @@ def packages(options):
 			if (rc) and (rcmd5):
 			    successfulUploadCounter += 1
 		    print_info(red(" * Upload completed for ")+bold(extractFTPHostFromUri(uri)))
-		    ftp.closeFTPConnection()
+		    ftp.closeConnection()
 
 	        # download queue
 	        if (detailedDownloadQueue != []):
@@ -613,7 +613,7 @@ def packages(options):
 			    successfulDownloadCounter += 1
 			
 		    print_info(red(" * Download completed for ")+bold(extractFTPHostFromUri(uri)))
-		    ftp.closeFTPConnection()
+		    ftp.closeConnection()
 
 		uploadCounter = int(uploadCounter)
 		downloadCounter = int(downloadCounter)
@@ -749,7 +749,7 @@ def database(options):
 	    ftp.setCWD(etpConst['etpurirelativepath'])
 	    if (ftp.isFileAvailable(etpConst['etpdatabaselockfile'])) or (ftp.isFileAvailable(etpConst['etpdatabasedownloadlockfile'])):
 		mirrorsLocked = True
-		ftp.closeFTPConnection()
+		ftp.closeConnection()
 		break
 	
 	if (mirrorsLocked):
diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py
index 456ff0d98..9bf1a3748 100644
--- a/libraries/databaseTools.py
+++ b/libraries/databaseTools.py
@@ -822,7 +822,7 @@ class etpDatabase:
 			dbLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"   "+entropyTools.extractFTPHostFromUri(db[0])+": DATABASE: "+db[1]+" | DOWNLOAD: "+db[2])
 	    	        print_info(bold("\t"+entropyTools.extractFTPHostFromUri(db[0])+": ")+red("[")+yellow("DATABASE: ")+db[1]+red("] [")+yellow("DOWNLOAD: ")+db[2]+red("]"))
 	    
-	            ftp.closeFTPConnection()
+	            ftp.closeConnection()
 	            sys.exit(320)
 
 		
diff --git a/libraries/entropyConstants.py b/libraries/entropyConstants.py
index 2578b7d08..7e91ce4fa 100644
--- a/libraries/entropyConstants.py
+++ b/libraries/entropyConstants.py
@@ -505,8 +505,8 @@ else:
 		time.sleep(5)
 
 	if line.startswith("httphandler|") and (len(line.split("|")) > 2):
-	    servername = line.split("httphandler|")[1]
-	    url = line.split("httphandler|")[2]
+	    servername = line.split("|")[1].strip()
+	    url = line.split("|")[2].strip()
 	    if not url.endswith("/"):
 		url = url+"/"
 	    etpRemoteSupport[servername] = url
diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py
index 9badeb902..f2f5062ad 100644
--- a/libraries/entropyTools.py
+++ b/libraries/entropyTools.py
@@ -321,7 +321,7 @@ def getEtpRemoteDatabaseStatus():
 	    revision = 0
 	info = [uri+"/"+etpConst['etpurirelativepath']+etpConst['etpdatabasefilegzip'],revision]
 	uriDbInfo.append(info)
-	ftp.closeFTPConnection()
+	ftp.closeConnection()
 
     entropyLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"getEtpRemoteDatabaseStatus: dump -> "+str(uriDbInfo))
 
@@ -541,7 +541,7 @@ def uploadDatabase(uris):
 	    print_warning(yellow(" * ")+red("Cannot properly upload to ")+bold(extractFTPHostFromUri(uri))+red(". Please check."))
 	
 	# close connection
-	ftp.closeFTPConnection()
+	ftp.closeConnection()
 	# unlock database
 	downloadLockDatabases(False,[uri])
 
@@ -603,7 +603,7 @@ def downloadDatabase(uri):
     entropyLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"downloadDatabase: do some tidy.")
     spawnCommand("rm -f " + etpConst['etpdatabasedir'] + "/" + etpConst['etpdatabasefilegzip'], "&> /dev/null")
     # close connection
-    ftp.closeFTPConnection()
+    ftp.closeConnection()
 
 # Reports in a list form the lock status of the mirrors
 # @ [ uri , True/False, True/False ] --> True = locked, False = unlocked
@@ -624,7 +624,7 @@ def getMirrorsLock():
 	if (ftp.isFileAvailable(etpConst['etpdatabasedownloadlockfile'])):
 	    # Upload is locked
 	    data[2] = True
-	ftp.closeFTPConnection()
+	ftp.closeConnection()
 	dbstatus.append(data)
     return dbstatus
 
@@ -651,7 +651,7 @@ def downloadPackageFromMirror(uri,pkgfile):
 	    entropyLog.log(ETP_LOGPRI_ERROR,ETP_LOGLEVEL_VERBOSE,"downloadPackageFromMirror: ("+tries+"/"+maxtries+") Error. File not found. -> "+pkgfile)
 	    # file does not exist
 	    print_warning(red("  * File ")+yellow(pkgfilename)+red(" does not exist remotely on ")+bold(extractFTPHostFromUri(uri)))
-	    ftp.closeFTPConnection()
+	    ftp.closeConnection()
 	    return None
 	entropyLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"downloadPackageFromMirror: ("+tries+"/"+maxtries+") checking md5 for -> "+pkgfile)
         # check md5
@@ -748,13 +748,13 @@ def lockDatabases(lock = True, mirrorList = []):
 	    if (ftp.isFileAvailable(etpConst['etpdatabaselockfile'])):
 		entropyLog.log(ETP_LOGPRI_WARNING,ETP_LOGLEVEL_VERBOSE,"lockDatabases: mirror "+extractFTPHostFromUri(uri)+" already locked.")
 	        print_info(green(" * ")+red("Mirror database at ")+bold(extractFTPHostFromUri(uri))+red(" already locked."))
-	        ftp.closeFTPConnection()
+	        ftp.closeConnection()
 	        continue
 	else:
 	    if (not ftp.isFileAvailable(etpConst['etpdatabaselockfile'])):
 		entropyLog.log(ETP_LOGPRI_WARNING,ETP_LOGLEVEL_VERBOSE,"lockDatabases: mirror "+extractFTPHostFromUri(uri)+" already unlocked.")
 	        print_info(green(" * ")+red("Mirror database at ")+bold(extractFTPHostFromUri(uri))+red(" already unlocked."))
-	        ftp.closeFTPConnection()
+	        ftp.closeConnection()
 	        continue
 	if (lock):
 	    f = open(etpConst['etpdatabasedir']+"/"+etpConst['etpdatabaselockfile'],"w")
@@ -784,7 +784,7 @@ def lockDatabases(lock = True, mirrorList = []):
 	        outstat = True
 	        print "\n"
 	        print_warning(red(" * ")+red("A problem occured while unlocking ")+bold(extractFTPHostFromUri(uri))+red(" mirror. Please have a look."))
-	ftp.closeFTPConnection()
+	ftp.closeConnection()
     return outstat
 
 def downloadLockDatabases(lock = True, mirrorList = []):
@@ -808,13 +808,13 @@ def downloadLockDatabases(lock = True, mirrorList = []):
 	if (lock):
 	    if (ftp.isFileAvailable(etpConst['etpdatabasedownloadlockfile'])):
 	        print_info(green(" * ")+red("Download mirror at ")+bold(extractFTPHostFromUri(uri))+red(" already locked."))
-	        ftp.closeFTPConnection()
+	        ftp.closeConnection()
 	        continue
 	else:
 	    if (not ftp.isFileAvailable(etpConst['etpdatabasedownloadlockfile'])):
 		entropyLog.log(ETP_LOGPRI_WARNING,ETP_LOGLEVEL_VERBOSE,"downloadLockDatabases: already unlocked -> "+extractFTPHostFromUri(uri))
 	        print_info(green(" * ")+red("Download mirror at ")+bold(extractFTPHostFromUri(uri))+red(" already unlocked."))
-	        ftp.closeFTPConnection()
+	        ftp.closeConnection()
 	        continue
 	if (lock):
 	    f = open(etpConst['packagestmpdir']+"/"+etpConst['etpdatabasedownloadlockfile'],"w")
@@ -840,7 +840,7 @@ def downloadLockDatabases(lock = True, mirrorList = []):
 	        outstat = True
 	        print "\n"
 	        print_warning(red(" * ")+red("A problem occured while unlocking ")+bold(extractFTPHostFromUri(uri))+red(" download mirror. Please have a look."))
-	ftp.closeFTPConnection()
+	ftp.closeConnection()
     return outstat
 
 def getLocalDatabaseRevision():
diff --git a/libraries/mirrorTools.py b/libraries/mirrorTools.py
index 7be9f3d69..e67708c8d 100644
--- a/libraries/mirrorTools.py
+++ b/libraries/mirrorTools.py
@@ -227,6 +227,7 @@ class handlerFTP:
 	    mirrorLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_NORMAL,"handlerFTP.advancedStorBinary: timeout receiving voidresp(), reconnecting...")
 	    self.reconnectHost()
 	    return "226"
+	return rc
 
     def uploadFile(self,file,ascii = False):
 	
@@ -368,6 +369,6 @@ class handlerFTP:
 	self.ftpconn.dir(self.bufferizer)
 	return self.FTPbuffer
 
-    def closeFTPConnection(self):
-	mirrorLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"handlerFTP.closeFTPConnection: called.")
+    def closeConnection(self):
+	mirrorLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"handlerFTP.closeConnection: called.")
 	self.ftpconn.quit()
diff --git a/libraries/outputTools.py b/libraries/outputTools.py
index de2334f3f..ec86d212b 100644
--- a/libraries/outputTools.py
+++ b/libraries/outputTools.py
@@ -229,6 +229,7 @@ def print_info(msg, back = False):
     print green(">>")+" "+msg
 
 def print_warning(msg):
+    writechar("\r                                                                                                                 \r")
     print yellow(">>")+" "+msg
 
 def print_generic(msg): # here we'll wrap any nice formatting