diff --git a/lib/html.php b/lib/html.php
index 996632e..3b8fc08 100644
--- a/lib/html.php
+++ b/lib/html.php
@@ -27,10 +27,17 @@
 
 	have ('html');
 
-	function unhtmlentities ($str)
+	function convertToHTML ($string)
 	{
-		$transTable = array_flip (get_html_translation_table (HTML_ENTITIES));
-		return strtr ($str, $transTable);
+		$table = array_flip (get_html_translation_table (HTML_ENTITIES));
+
+		return strtr ($string, $table);
 	}
 
+	function convertFromHTML ($string)
+	{
+		$table = get_html_translation_table (HTML_ENTITIES);
+
+		return strtr ($string, $table);
+	}
 ?>
\ No newline at end of file
diff --git a/lib/news.php b/lib/news.php
index c2a8b3e..91e6fce 100644
--- a/lib/news.php
+++ b/lib/news.php
@@ -27,7 +27,6 @@
 */
 
 have ('news');
-need ('sql');
 									// SQL definition for news table
 $createQuery="CREATE TABLE news_main ("
 			."	n_id	INT NOT NULL PRIMARY KEY AUTO_INCREMENT,"
@@ -49,9 +48,9 @@ function formatNews ($date, $user, $text)
 
 function formatNewsArray ($a)
 {
-	need ("date");
+	need ('date');
 
-	return formatNews (dateFromSQLDateTime ($a['n_date']), $a['n_user'], StripSlashes($a['n_news']));
+	return formatNews (dateFromSQLDateTime ($a['n_date']), $a['n_user'], stripSlashes($a['n_news']));
 }
 
 
@@ -69,6 +68,8 @@ function printNewsArray ($a)
 
 function latestNews ($max)
 {
+	need ('sql');
+
 	$query = 'SELECT n_date, n_user, n_news FROM news_main'
 			." ORDER BY n_date DESC LIMIT $max";
 
@@ -95,6 +96,8 @@ function printLatestNews ($max)
 
 function monthlyNews ($month, $year)
 {
+	need ('sql');
+
 	if (($year < 1999) || ($year > date ('Y'))) {	// Sanity checking
 		$year = date ('Y');
 	}
@@ -126,6 +129,8 @@ function monthlyNews ($month, $year)
 
 function searchNews ($string)
 {
+	need ('sql');
+
 	$filler = date ('d M Y');
 	$search = addSlashes ("%$string%");
 	$query = 'SELECT n_date, n_user, n_news FROM news_main'