diff --git a/ChangeLog b/ChangeLog
index f750d241..29136813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+27.3.2000
+	* Fixed misspelled exception in UrlData.py (BugTracker)
+	* Fixed wrong _time argument in HttpsUrlData.py 
+	  (Peter <peterw@waybeat.com.au>)
+	* Fixed missing env argument in lc.cgi
+
 26.3.2000
 	* FastCGI fixes
 	* simplified sz_fcgi.py
diff --git a/Makefile b/Makefile
index a6057ee2..457cc44c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION=$(shell ./setup.py -V)
-HOST=treasure.calvinsplayground.de
+#HOST=treasure.calvinsplayground.de
 PROXY=
 #PROXY=-P$(HOST):5050
-#HOST=fsinfo.cs.uni-sb.de
+HOST=fsinfo.cs.uni-sb.de
 #PROXY=-Pwww-proxy.uni-sb.de:3128
 PACKAGE = linkchecker
 DEBPACKAGE = $(PACKAGE)_$(VERSION)_i386.deb
diff --git a/lc.cgi b/lc.cgi
index 33812c0c..e4d66552 100755
--- a/lc.cgi
+++ b/lc.cgi
@@ -22,7 +22,7 @@ print
 #testit()
 form = cgi.FieldStorage()
 if not linkcheck.lc_cgi.checkform(form):
-    linkcheck.lc_cgi.logit(form)
+    linkcheck.lc_cgi.logit(form, form)
     linkcheck.lc_cgi.printError(sys.stdout)
     sys.exit(0)
 config = linkcheck.Config.Configuration()
diff --git a/linkcheck/Config.py b/linkcheck/Config.py
index 9ccf87cf..559d5922 100644
--- a/linkcheck/Config.py
+++ b/linkcheck/Config.py
@@ -7,8 +7,9 @@ AppName = "LinkChecker"
 App = AppName+" "+Version
 UserAgent = AppName+"/"+Version
 Author =  "Bastian Kleineidam"
+HtmlAuthor = "Bastian&nbsp;Kleineidam"
 Copyright = "Copyright © 2000 by "+Author
-HtmlCopyright = "Copyright &copy; 2000 by "+Author
+HtmlCopyright = "Copyright &copy; 2000 by "+HtmlAuthor
 AppInfo = App+"              "+Copyright
 HtmlAppInfo = App+", "+HtmlCopyright
 Url = "http://linkchecker.sourceforge.net/"
@@ -218,7 +219,7 @@ class Configuration(UserDict.UserDict):
         
     def read(self, files = []):
         if not files:
-            files.insert(0,_norm("~/.pylicerc"))
+            files.insert(0,_norm("~/.linkcheckerrc"))
             if sys.platform=="win32":
                 if not sys.path[0]:
                     path=os.getcwd()
@@ -226,7 +227,7 @@ class Configuration(UserDict.UserDict):
                     path=sys.path[0]
             else:
                 path="/etc"
-            files.insert(0,_norm(join(path, "pylicerc")))
+            files.insert(0,_norm(join(path, "linkcheckerrc")))
         self.readConfig(files)
     
     def warn(self, msg):
@@ -292,7 +293,7 @@ class Configuration(UserDict.UserDict):
             filelist = string.split(cfgparser.get(section, "fileoutput"))
             for arg in filelist:
                 if Loggers.has_key(arg):
-		    self.data["fileoutput"].append(Loggers[arg](open("pylice-out."+arg, "w")))
+		    self.data["fileoutput"].append(Loggers[arg](open("linkchecker-out."+arg, "w")))
 	except ConfigParser.Error:	pass
 
         section = "authentication"
diff --git a/linkcheck/MailtoUrlData.py b/linkcheck/MailtoUrlData.py
index b9cc3b85..39efdad8 100644
--- a/linkcheck/MailtoUrlData.py
+++ b/linkcheck/MailtoUrlData.py
@@ -1,7 +1,7 @@
 import re,socket,string,DNS,sys
 from HostCheckingUrlData import HostCheckingUrlData
 from smtplib import SMTP
-from UrlData import LinkCheckException
+from UrlData import LinkCheckerException
 
 mailto_re = re.compile("^mailto:"
                        "([\-\w.]+@[\-\w.?=]+|[\w\s]+<[\-\w.]+@[\-\w.?=]+>)$")
@@ -11,7 +11,7 @@ class MailtoUrlData(HostCheckingUrlData):
     def buildUrl(self):
         HostCheckingUrlData.buildUrl(self)
         if not mailto_re.match(self.urlName):
-            raise LinkCheckException, "Illegal mailto link syntax"
+            raise LinkCheckerException, "Illegal mailto link syntax"
         self.host = self.urlName[7:]
         i = string.find(self.host, "<")
         j = string.find(self.host, ">")
diff --git a/linkcheck/TelnetUrlData.py b/linkcheck/TelnetUrlData.py
index 7715f8d4..03549fa0 100644
--- a/linkcheck/TelnetUrlData.py
+++ b/linkcheck/TelnetUrlData.py
@@ -1,6 +1,6 @@
 import telnetlib,re
 from HostCheckingUrlData import HostCheckingUrlData
-from UrlData import LinkCheckException
+from UrlData import LinkCheckerException
 
 telnet_re =  re.compile("^telnet:[\w.\-]+$")
 
@@ -10,7 +10,7 @@ class TelnetUrlData(HostCheckingUrlData):
     def buildUrl(self):
         HostCheckingUrlData.buildUrl(self)
         if not telnet_re.match(self.urlName):
-            raise LinkCheckException, "Illegal telnet link syntax"
+            raise LinkCheckerException, "Illegal telnet link syntax"
         self.host = string.lower(self.urlName[7:])
 
 
diff --git a/linkcheck/UrlData.py b/linkcheck/UrlData.py
index 9192b543..2ef2156b 100644
--- a/linkcheck/UrlData.py
+++ b/linkcheck/UrlData.py
@@ -11,7 +11,7 @@ LinkTags = [("a",     "href"),
             ("meta",  "url"),  
             ("area",  "href")]
 
-class LinkCheckException(Exception):
+class LinkCheckerException(Exception):
     pass
 
 class UrlData:
@@ -104,8 +104,9 @@ class UrlData:
         try:
 	    self.buildUrl()
             self.extern = self._getExtern(config)
-        except LinkCheckerException, msg:
-            self.setError(msg)
+        except LinkCheckerException:
+            type, value = sys.exc_info()[:2]
+            self.setError(str(value))
             self.logMe(config)
             return
 
@@ -130,6 +131,7 @@ class UrlData:
             self.checkConnection(config)
             if self.urlTuple and config["anchors"]:
                 self.checkAnchors(self.urlTuple[5])
+        # XXX should only catch some exceptions, not all!
         except:
             type, value = sys.exc_info()[:2]
             self.setError(str(value))