diff --git a/Text/XHtml/Extras.hs b/Text/XHtml/Extras.hs
--- a/Text/XHtml/Extras.hs
+++ b/Text/XHtml/Extras.hs
@@ -68,6 +68,9 @@
       toHtml hl = anchor ! (href (hotLinkURL hl) : hotLinkAttributes hl)
                       << hotLinkContents hl
 
+instance ADDATTRS HotLink where
+      hl ! attr = hl { hotLinkAttributes = hotLinkAttributes hl ++ attr }
+
 hotlink :: URL -> Html -> HotLink
 hotlink url h = HotLink {
       hotLinkURL = url,
diff --git a/Text/XHtml/Internals.hs b/Text/XHtml/Internals.hs
--- a/Text/XHtml/Internals.hs
+++ b/Text/XHtml/Internals.hs
@@ -173,7 +173,7 @@
       fixChar '>' = "&gt;"
       fixChar '&' = "&amp;"
       fixChar '"' = "&quot;"
-      fixChar c | ord c < 0xff = [c]
+      fixChar c | ord c < 0x80 = [c]
       fixChar c = "&#" ++ show (ord c) ++ ";"
 
 
@@ -181,7 +181,8 @@
 -- use stringToHtml or lineToHtml instead, for user strings, 
 -- because they understand special chars, like @'<'@.
 primHtml :: String -> Html
-primHtml x    = Html [HtmlString x]
+primHtml x | null x    = Html []
+           | otherwise = Html [HtmlString x]
 
 
 
diff --git a/xhtml.cabal b/xhtml.cabal
--- a/xhtml.cabal
+++ b/xhtml.cabal
@@ -1,5 +1,5 @@
 Name: xhtml
-Version: 3000.0.2.2
+Version: 3000.1.0.0
 Copyright: Bjorn Bringert 2004-2006, Andy Gill, and the Oregon Graduate 
            Institute of Science and Technology, 1999-2001
 Maintainer: bjorn@bringert.net