diff --git a/config/web.xml b/config/web.xml
index 299e180..9b6b41d 100644
--- a/config/web.xml
+++ b/config/web.xml
@@ -98,6 +98,11 @@
 		<param-value>/index.jsp</param-value>
 	</init-param>
 </servlet>
+
+<servlet>
+	<servlet-name>test</servlet-name>
+	<servlet-class>org.thdl.lex.HibernateTestServlet</servlet-class>
+</servlet>
  
 <!--SERVLET MAPPPINGS-->
 
@@ -121,7 +126,13 @@
 	<url-pattern>/logout</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+	<servlet-name>test</servlet-name>
+	<url-pattern>/test</url-pattern>
+</servlet-mapping>
+
 <!--TAGLIBS-->
+
 <!--RELEASE TAGLIBS
 <taglib>
   <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
diff --git a/src/java/org/thdl/lex/HibernateTestServlet.java b/src/java/org/thdl/lex/HibernateTestServlet.java
index eb44f0f..61e8372 100644
--- a/src/java/org/thdl/lex/HibernateTestServlet.java
+++ b/src/java/org/thdl/lex/HibernateTestServlet.java
@@ -1,27 +1,27 @@
 package org.thdl.lex;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.*;
+import java.util.*;
+import javax.servlet.ServletException;
+// import net.sf.hibernate.tool.hbm2ddl.*;
 
-import org.thdl.lex.component.*;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 // import org.thdl.lex.component.peers.*;
 
 import net.sf.hibernate.*;
 import net.sf.hibernate.cfg.*;
-// import net.sf.hibernate.tool.hbm2ddl.*;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletException;
-import java.sql.*;
-import java.util.*;
-import java.io.IOException;
-import java.io.PrintWriter;
+import org.thdl.lex.component.*;
 
 
 /**
  *  Description of the Class
  *
- *@author     travis
- *@created    October 1, 2003
+ * @author     travis
+ * @created    October 1, 2003
  */
 public class HibernateTestServlet
 		 extends HttpServlet
@@ -35,8 +35,8 @@ public class HibernateTestServlet
 	/**
 	 *  Sets the sessionFactory attribute of the HibernateTestServlet object
 	 *
-	 *@param  sessionFactory  The new sessionFactory value
-	 *@since
+	 * @param  sessionFactory  The new sessionFactory value
+	 * @since
 	 */
 	public void setSessionFactory( SessionFactory sessionFactory )
 	{
@@ -47,8 +47,8 @@ public class HibernateTestServlet
 	/**
 	 *  Sets the session attribute of the HibernateTestServlet object
 	 *
-	 *@param  session  The new session value
-	 *@since
+	 * @param  session  The new session value
+	 * @since
 	 */
 	public void setSession( Session session )
 	{
@@ -59,8 +59,8 @@ public class HibernateTestServlet
 	/**
 	 *  Sets the transaction attribute of the HibernateTestServlet object
 	 *
-	 *@param  transaction  The new transaction value
-	 *@since
+	 * @param  transaction  The new transaction value
+	 * @since
 	 */
 	public void setTransaction( Transaction transaction )
 	{
@@ -71,8 +71,8 @@ public class HibernateTestServlet
 	/**
 	 *  Gets the sessionFactory attribute of the HibernateTestServlet object
 	 *
-	 *@return    The sessionFactory value
-	 *@since
+	 * @return    The sessionFactory value
+	 * @since
 	 */
 	public SessionFactory getSessionFactory()
 	{
@@ -83,8 +83,8 @@ public class HibernateTestServlet
 	/**
 	 *  Gets the session attribute of the HibernateTestServlet object
 	 *
-	 *@return    The session value
-	 *@since
+	 * @return    The session value
+	 * @since
 	 */
 	public Session getSession()
 	{
@@ -95,8 +95,8 @@ public class HibernateTestServlet
 	/**
 	 *  Gets the transaction attribute of the HibernateTestServlet object
 	 *
-	 *@return    The transaction value
-	 *@since
+	 * @return    The transaction value
+	 * @since
 	 */
 	public Transaction getTransaction()
 	{
@@ -107,11 +107,11 @@ public class HibernateTestServlet
 	/**
 	 *  Description of the Method
 	 *
-	 *@param  request               Description of Parameter
-	 *@param  response              Description of Parameter
-	 *@exception  ServletException  Description of Exception
-	 *@exception  IOException       Description of Exception
-	 *@since
+	 * @param  request               Description of Parameter
+	 * @param  response              Description of Parameter
+	 * @exception  ServletException  Description of Exception
+	 * @exception  IOException       Description of Exception
+	 * @since
 	 */
 	public void doGet( HttpServletRequest request, HttpServletResponse response )
 			 throws ServletException, IOException
@@ -121,15 +121,17 @@ public class HibernateTestServlet
 		{
 			initHibernate();
 
-			response.setContentType( "text/html" );
+			//response.setContentType( "text/html" );
+			response.setContentType( "text/html;charset=UTF-8;" );
+			request.setCharacterEncoding( "UTF-8" );
+
 			PrintWriter out = response.getWriter();
 			out.println( "<html><body>" );
-
 			beginTransaction();
-			processMods( out );
-			//testQuery( out );
+			testQuery( out );
 			endTransaction( false );
-
+			LexLogger.logRequestState( request );
+			LexLogger.logResponseState( response );
 			out.println( "</body></html>" );
 
 		}
@@ -165,8 +167,8 @@ public class HibernateTestServlet
 	/**
 	 *  Description of the Method
 	 *
-	 *@exception  HibernateException  Description of Exception
-	 *@since
+	 * @exception  HibernateException  Description of Exception
+	 * @since
 	 */
 	private void initHibernate()
 			 throws HibernateException
@@ -180,8 +182,8 @@ public class HibernateTestServlet
 	/**
 	 *  Description of the Method
 	 *
-	 *@exception  HibernateException  Description of Exception
-	 *@since
+	 * @exception  HibernateException  Description of Exception
+	 * @since
 	 */
 	private void beginTransaction()
 			 throws HibernateException
@@ -194,9 +196,9 @@ public class HibernateTestServlet
 	/**
 	 *  Description of the Method
 	 *
-	 *@param  commit                  Description of Parameter
-	 *@exception  HibernateException  Description of Exception
-	 *@since
+	 * @param  commit                  Description of Parameter
+	 * @exception  HibernateException  Description of Exception
+	 * @since
 	 */
 	private void endTransaction( boolean commit )
 			 throws HibernateException
@@ -215,47 +217,25 @@ public class HibernateTestServlet
 	}
 
 
-	/**
-	 *  Description of the Method
-	 *
-	 *@param  out                     Description of Parameter
-	 *@exception  SQLException        Description of Exception
-	 *@exception  HibernateException  Description of Exception
-	 *@since
-	 */
-	public void processMods( PrintWriter out ) throws SQLException, HibernateException
-	{
-		String queryString = "FROM org.thdl.lex.component.LexComponent";
-		Query query = getSession().createQuery( queryString );
-
-		out.println( "Starting..." );
-		for ( Iterator it = query.iterate(); it.hasNext();  )
-		{
-			ILexComponent lc = (ILexComponent) it.next();
-			out.println( lc.getMetaId() + " </br/> " );
-		}
-	}
-
 
 	/**
 	 *  A unit test for JUnit
 	 *
-	 *@param  out                     Description of Parameter
-	 *@exception  SQLException        Description of Exception
-	 *@exception  HibernateException  Description of Exception
-	 *@since
+	 * @param  out                     Description of Parameter
+	 * @exception  SQLException        Description of Exception
+	 * @exception  HibernateException  Description of Exception
+	 * @since
 	 */
 	public void testQuery( PrintWriter out )
 			 throws SQLException, HibernateException
 	{
-		String queryString = "FROM org.thdl.lex.component.Term as term WHERE term.term = :term";
+		String queryString = "FROM org.thdl.lex.component.Pronunciation";
 		Query query = getSession().createQuery( queryString );
-		ITerm term = new Term();
-		term.setTerm( "thos pa" );
-		query.setProperties( term );
 		for ( Iterator it = query.iterate(); it.hasNext();  )
 		{
-			out.println( it.next() );
+			String s = ( (IPronunciation) it.next() ).getPhonetics();
+			out.println( s + "<br/>" );
+			LexLogger.debug( "Diacritics Test: " + s );
 		}
 	}
 }
diff --git a/src/java/org/thdl/lex/LexActionServlet.java b/src/java/org/thdl/lex/LexActionServlet.java
index 720c94e..4b98391 100644
--- a/src/java/org/thdl/lex/LexActionServlet.java
+++ b/src/java/org/thdl/lex/LexActionServlet.java
@@ -90,7 +90,9 @@ public class LexActionServlet extends HttpServlet
 	 */
 	public void service( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException
 	{
-		res.setContentType( "text/html; charset=UTF-8" );
+		res.setContentType( "text/html; charset=UTF-8;" );
+		req.setCharacterEncoding( "UTF-8" );
+
 		/*
 		    LexLogger.debug( "Checking Request state at start of LexActionServlet.service()" );
 		    LexLogger.logRequestState( req );
diff --git a/src/java/org/thdl/lex/LexComponentFilter.java b/src/java/org/thdl/lex/LexComponentFilter.java
index 672746b..700ea60 100644
--- a/src/java/org/thdl/lex/LexComponentFilter.java
+++ b/src/java/org/thdl/lex/LexComponentFilter.java
@@ -176,6 +176,9 @@ public class LexComponentFilter implements Filter
 			}
 			chain.doFilter( request, response );
 
+			HttpServletResponse resp = (HttpServletResponse) response;
+			resp.setContentType( "text/html; charset=UTF-8;" );
+			LexLogger.logResponseState( resp );
 			try
 			{
 				LexComponentRepository.cleanup();
diff --git a/src/java/org/thdl/lex/LexLogger.java b/src/java/org/thdl/lex/LexLogger.java
index a27078c..b049c66 100644
--- a/src/java/org/thdl/lex/LexLogger.java
+++ b/src/java/org/thdl/lex/LexLogger.java
@@ -30,21 +30,55 @@ public class LexLogger
 	{
 
 		Iterator it;
+		LOGGER.debug( "authType: " + req.getAuthType() );
+		LOGGER.debug( "characterEncoding: " + req.getCharacterEncoding() );
+		LOGGER.debug( "contentLength: " + req.getContentLength() );
+		LOGGER.debug( "contentType: " + req.getContentType() );
+		LOGGER.debug( "method: " + req.getMethod() );
+		LOGGER.debug( "pathInfo: " + req.getPathInfo() );
+		LOGGER.debug( "pathTranslated: " + req.getPathTranslated() );
+		LOGGER.debug( "protocol: " + req.getProtocol() );
+		LOGGER.debug( "queryString: " + req.getQueryString() );
+		LOGGER.debug( "remoteAddr: " + req.getRemoteAddr() );
+		LOGGER.debug( "remoteHost: " + req.getRemoteHost() );
+		LOGGER.debug( "remoteUser: " + req.getRemoteUser() );
+		LOGGER.debug( "requestedSessionId: " + req.getRequestedSessionId() );
+		LOGGER.debug( "requestedSessionIdFromCookie: " + req.isRequestedSessionIdFromCookie() );
+		LOGGER.debug( "requestedSessionIdFromURL: " + req.isRequestedSessionIdFromURL() );
+		LOGGER.debug( "requestedSessionIdValid: " + req.isRequestedSessionIdValid() );
+		LOGGER.debug( "requestURI: " + req.getRequestURI() );
+		LOGGER.debug( "scheme: " + req.getScheme() );
+		LOGGER.debug( "serverName: " + req.getServerName() );
+		LOGGER.debug( "serverPort: " + req.getServerPort() );
+		LOGGER.debug( "contextPath: " + req.getContextPath() );
+		LOGGER.debug( "servletPath: " + req.getServletPath() );
 		Enumeration enum = req.getParameterNames();
 		while ( enum.hasMoreElements() )
 		{
 			String parm = (String) enum.nextElement();
-			LOGGER.debug( "Request Parameter " + parm + " = '" + req.getParameter( parm ) + "'" );
+			LOGGER.debug( "Request Parameter: " + parm + " = '" + req.getParameter( parm ) + "'" );
 		}
 		enum = req.getAttributeNames();
 		while ( enum.hasMoreElements() )
 		{
 			String att = (String) enum.nextElement();
-			LOGGER.debug( "Request Attribute " + att + " = " + req.getAttribute( att ) );
+			LOGGER.debug( "Request Attribute: " + att + " =: " + req.getAttribute( att ) );
 		}
 	}
 
 
+	/**
+	 *  Description of the Method
+	 *
+	 * @param  resp  Description of the Parameter
+	 */
+	public static void logResponseState( HttpServletResponse resp )
+	{
+		LOGGER.debug( "RESPONSE STATE" );
+		LOGGER.debug( "characterEncoding: " + resp.getCharacterEncoding() );
+	}
+
+
 	/**
 	 *  Description of the Method
 	 *
@@ -63,7 +97,7 @@ public class LexLogger
 		while ( enum.hasMoreElements() )
 		{
 			String att = (String) enum.nextElement();
-			LOGGER.debug( "Session Attribute " + att + " = " + ses.getAttribute( att ) );
+			LOGGER.debug( "Session Attribute: " + att + " =: " + ses.getAttribute( att ) );
 		}
 
 		if ( null == visit )
@@ -90,7 +124,7 @@ public class LexLogger
 			String att = (String) enum.nextElement();
 			if ( !EXCLUDED_PARAMS.contains( att ) )
 			{
-				LOGGER.debug( "Context Attribute " + att + " = " + context.getAttribute( att ) );
+				LOGGER.debug( "Context Attribute: " + att + " =: " + context.getAttribute( att ) );
 			}
 		}
 		debugComponent( context.getAttribute( LexConstants.GLOBAL_CONTEXT_ATTR ) );
@@ -150,13 +184,13 @@ public class LexLogger
 	{
 		try
 		{
-			LOGGER.debug( "Describing: " + component );
+			LOGGER.debug( "Describing:: " + component );
 			String label = component instanceof ILexComponent ? ( (ILexComponent) component ).getLabel() : component.toString();
 			Iterator it = BeanUtils.describe( component ).entrySet().iterator();
 			while ( it.hasNext() )
 			{
 				Map.Entry entry = (Map.Entry) it.next();
-				LOGGER.debug( label + " property: " + entry.getKey() + " = '" + entry.getValue() + "'" );
+				LOGGER.debug( label + " property:: " + entry.getKey() + " = '" + entry.getValue() + "'" );
 			}
 		}
 		catch ( Exception e )
@@ -164,7 +198,7 @@ public class LexLogger
 			StringWriter writer = new StringWriter();
 			e.printStackTrace( new PrintWriter( writer ) );
 			String stackTrace = writer.getBuffer().toString();
-			LOGGER.debug( "LexLogger caught an Exception: " + stackTrace );
+			LOGGER.debug( "LexLogger caught an Exception:: " + stackTrace );
 		}
 	}
 }
diff --git a/src/jsp/jsp/displayDefinition.jsf b/src/jsp/jsp/displayDefinition.jsf
index 8ad6d51..4e2bfa7 100644
--- a/src/jsp/jsp/displayDefinition.jsf
+++ b/src/jsp/jsp/displayDefinition.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayEncyclopediaArticle.jsf b/src/jsp/jsp/displayEncyclopediaArticle.jsf
index f78b537..cda1833 100644
--- a/src/jsp/jsp/displayEncyclopediaArticle.jsf
+++ b/src/jsp/jsp/displayEncyclopediaArticle.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <c:set var="encyclopediaArticle" value="${ sessionScope.visit.helper.component }"/>
diff --git a/src/jsp/jsp/displayEntry.jsp b/src/jsp/jsp/displayEntry.jsp
index 790fd9f..da93b1a 100644
--- a/src/jsp/jsp/displayEntry.jsp
+++ b/src/jsp/jsp/displayEntry.jsp
@@ -1,8 +1,10 @@
-<%@ page  buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%>
+<%@ page  buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" pageEncoding="UTF-8" contentType="text/html"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-
+<% request.setCharacterEncoding("UTF-8"); %> 
+<!--Begin Render-->
 <jsp:include page="header.jsf" flush="false"/>
 
+
 <!--displayEntry.jsp-->
 <c:set var="editMode" value="${ false }" scope="request"/>
 <c:if test="${ ! sessionScope.visit.user.guest && sessionScope.visit.helper.showEditOptions }">
diff --git a/src/jsp/jsp/displayEtymology.jsf b/src/jsp/jsp/displayEtymology.jsf
index 31f6a24..9495430 100644
--- a/src/jsp/jsp/displayEtymology.jsf
+++ b/src/jsp/jsp/displayEtymology.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayForm.jsp b/src/jsp/jsp/displayForm.jsp
index 339dd69..a4232fb 100644
--- a/src/jsp/jsp/displayForm.jsp
+++ b/src/jsp/jsp/displayForm.jsp
@@ -1,5 +1,4 @@
-<%-- <%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>--%>
-<%@ page  buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>
+<%@ page  buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <jsp:include page="header.jsf" flush="false" />
diff --git a/src/jsp/jsp/displayFunction.jsf b/src/jsp/jsp/displayFunction.jsf
index 5901858..4c4231b 100644
--- a/src/jsp/jsp/displayFunction.jsf
+++ b/src/jsp/jsp/displayFunction.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <c:set var="function" value="${ sessionScope.visit.helper.component }"/>
diff --git a/src/jsp/jsp/displayKeyword.jsf b/src/jsp/jsp/displayKeyword.jsf
index 45e9f85..25dc73b 100644
--- a/src/jsp/jsp/displayKeyword.jsf
+++ b/src/jsp/jsp/displayKeyword.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayMeta.jsf b/src/jsp/jsp/displayMeta.jsf
index 1b62d3b..74f02ef 100644
--- a/src/jsp/jsp/displayMeta.jsf
+++ b/src/jsp/jsp/displayMeta.jsf
@@ -1,4 +1,5 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"  %>
 
 <c:set var="isNote" value='${ sessionScope.visit.helper.component.label == "analyticalNote" }'/>
 <c:set var="isTranslation" value='${ sessionScope.visit.helper.componentIsTranslation }'/>
diff --git a/src/jsp/jsp/displayModelSentence.jsf b/src/jsp/jsp/displayModelSentence.jsf
index f58f006..a49f95d 100644
--- a/src/jsp/jsp/displayModelSentence.jsf
+++ b/src/jsp/jsp/displayModelSentence.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayNotes.jsf b/src/jsp/jsp/displayNotes.jsf
index 1115058..d107b6c 100644
--- a/src/jsp/jsp/displayNotes.jsf
+++ b/src/jsp/jsp/displayNotes.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <c:if test="${ sessionScope.visit.helper.showNotes }">
diff --git a/src/jsp/jsp/displayPassage.jsf b/src/jsp/jsp/displayPassage.jsf
index baa66a1..a4a4028 100644
--- a/src/jsp/jsp/displayPassage.jsf
+++ b/src/jsp/jsp/displayPassage.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false" contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayPronunciation.jsf b/src/jsp/jsp/displayPronunciation.jsf
index 477d6ab..e6ada39 100644
--- a/src/jsp/jsp/displayPronunciation.jsf
+++ b/src/jsp/jsp/displayPronunciation.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false" contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayRegister.jsf b/src/jsp/jsp/displayRegister.jsf
index 1e2eadb..0ce50b9 100644
--- a/src/jsp/jsp/displayRegister.jsf
+++ b/src/jsp/jsp/displayRegister.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayRelatedTerm.jsf b/src/jsp/jsp/displayRelatedTerm.jsf
index 0f5fc7b..4162e6d 100644
--- a/src/jsp/jsp/displayRelatedTerm.jsf
+++ b/src/jsp/jsp/displayRelatedTerm.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displaySpelling.jsf b/src/jsp/jsp/displaySpelling.jsf
index ef3596c..6a9d2bc 100644
--- a/src/jsp/jsp/displaySpelling.jsf
+++ b/src/jsp/jsp/displaySpelling.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <c:set var="spelling" value="${ sessionScope.visit.helper.component }"/>
diff --git a/src/jsp/jsp/displaySubdefinition.jsf b/src/jsp/jsp/displaySubdefinition.jsf
index 567b540..3e8618d 100644
--- a/src/jsp/jsp/displaySubdefinition.jsf
+++ b/src/jsp/jsp/displaySubdefinition.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayTerm.jsf b/src/jsp/jsp/displayTerm.jsf
index 62512dd..111c351 100644
--- a/src/jsp/jsp/displayTerm.jsf
+++ b/src/jsp/jsp/displayTerm.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <!--displayTerm.jsf-->
diff --git a/src/jsp/jsp/displayTransitionalData.jsf b/src/jsp/jsp/displayTransitionalData.jsf
index df4bf65..565f836 100644
--- a/src/jsp/jsp/displayTransitionalData.jsf
+++ b/src/jsp/jsp/displayTransitionalData.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <!--displayTransitionalData.jsf-->
 
diff --git a/src/jsp/jsp/displayTranslationEquivalent.jsf b/src/jsp/jsp/displayTranslationEquivalent.jsf
index 7a47979..d72fce6 100644
--- a/src/jsp/jsp/displayTranslationEquivalent.jsf
+++ b/src/jsp/jsp/displayTranslationEquivalent.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 
diff --git a/src/jsp/jsp/displayTree.jsf b/src/jsp/jsp/displayTree.jsf
index a15051d..fcf1e19 100644
--- a/src/jsp/jsp/displayTree.jsf
+++ b/src/jsp/jsp/displayTree.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> 
 
 <!--displayTree.jsf-->
diff --git a/src/jsp/jsp/displayTreeToc.jsf b/src/jsp/jsp/displayTreeToc.jsf
index e7ce56b..3d1adba 100644
--- a/src/jsp/jsp/displayTreeToc.jsf
+++ b/src/jsp/jsp/displayTreeToc.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false" %>
+<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"  contentType="text/html; charset=UTF-8" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> 
 
 <!--displayTreeToc.jsf-->
diff --git a/src/jsp/jsp/error.jsp b/src/jsp/jsp/error.jsp
index ccaff06..4e74b27 100644
--- a/src/jsp/jsp/error.jsp
+++ b/src/jsp/jsp/error.jsp
@@ -1,5 +1,5 @@
-<%@ page import="java.io.PrintWriter,java.io.StringWriter,org.thdl.lex.*,org.thdl.lex.component.*" isErrorPage="true" %>
-<%@ taglib prefix="req" uri="http://jakarta.apache.org/taglibs/request-1.0" %>
+<%@ page  buffer="512kb" autoFlush="false" import="java.io.*, org.thdl.lex.*,org.thdl.lex.component.*" isErrorPage="true" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
@@ -45,8 +45,6 @@ The message appears below.<br />
 	{ LexComponent lab =  (LexComponent) request.getAttribute("component");
 %>
 <b> Label: </b> <i> <%= lab %> </i><br /><br /> 
-<%-- <b> Sql String: </b> <i> <%= lab.getSqlString() %> </i> 
- --%>
 
 <% } %> <br /><br />
 
@@ -57,7 +55,10 @@ The message appears below.<br />
 %>
 <pre>
 <%= stackTrace %>
-</pre>
+</pre> 
+
+
+
 </p>
 </div>
 
diff --git a/src/jsp/jsp/footer.jsf b/src/jsp/jsp/footer.jsf
index e0e8198..a54a14f 100644
--- a/src/jsp/jsp/footer.jsf
+++ b/src/jsp/jsp/footer.jsf
@@ -1,4 +1,4 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*"  %>
+<%@ page  import="org.thdl.lex.LexLogger" contentType="text/html; charset=UTF-8" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <%@ taglib prefix = "req" uri = "http://jakarta.apache.org/taglibs/request-1.0" %>
 
@@ -25,3 +25,5 @@
 
 </body>
 </html>
+
+<% LexLogger.debug( "Footer.jsf has finished rendering." ); %>
diff --git a/src/jsp/jsp/goodbye.jsp b/src/jsp/jsp/goodbye.jsp
index 1ce95b1..c596508 100644
--- a/src/jsp/jsp/goodbye.jsp
+++ b/src/jsp/jsp/goodbye.jsp
@@ -1,3 +1,5 @@
+<%@ page import="java.io.PrintWriter,java.io.StringWriter,org.thdl.lex.*,org.thdl.lex.component.*" isErrorPage="true" contentType="text/html; charset=UTF-8"%>
+
 <jsp:include page="header.jsf" flush="false" />
 
 <p>Thank you</p>
diff --git a/src/jsp/jsp/header.jsf b/src/jsp/jsp/header.jsf
index 1deabea..61af465 100644
--- a/src/jsp/jsp/header.jsf
+++ b/src/jsp/jsp/header.jsf
@@ -1,10 +1,10 @@
-<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*"  %>
+<%@ page import="org.thdl.lex.*" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
 <script type='text/javascript' src='/lex/js/lex.js'></script>
 
diff --git a/src/jsp/jsp/menu.jsp b/src/jsp/jsp/menu.jsp
index ca90eeb..e338297 100644
--- a/src/jsp/jsp/menu.jsp
+++ b/src/jsp/jsp/menu.jsp
@@ -1,4 +1,4 @@
-<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>
+<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <jsp:include page="header.jsf" flush="false" />
diff --git a/src/jsp/jsp/metaDefaultsForm.jsp b/src/jsp/jsp/metaDefaultsForm.jsp
index 2289adf..1abd5a6 100644
--- a/src/jsp/jsp/metaDefaultsForm.jsp
+++ b/src/jsp/jsp/metaDefaultsForm.jsp
@@ -1,5 +1,6 @@
-<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>
+<%@ page  buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+
 <jsp:include page="header.jsf" flush="false" />
 <!--metaDefaultsForm.jsp-->
 
diff --git a/src/jsp/jsp/metaPrefsForm.jsp b/src/jsp/jsp/metaPrefsForm.jsp
index e51ac33..38dbc23 100644
--- a/src/jsp/jsp/metaPrefsForm.jsp
+++ b/src/jsp/jsp/metaPrefsForm.jsp
@@ -1,5 +1,6 @@
-<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>
+<%@ page  buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+
 <jsp:include page="header.jsf" flush="false" />
 <!--metaPrefsForm.jsp-->
 
diff --git a/src/jsp/jsp/navLinks.jsf b/src/jsp/jsp/navLinks.jsf
index c4fea81..add9d2b 100644
--- a/src/jsp/jsp/navLinks.jsf
+++ b/src/jsp/jsp/navLinks.jsf
@@ -1,4 +1,5 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"  %>
 <ul class="navLinks">
 <li>
 <a href="http://iris.lib.virginia.edu/tibet/reference/dictionary.html">Dictionary Home</a> | 
diff --git a/src/jsp/jsp/search.jsp b/src/jsp/jsp/search.jsp
index 16b68f3..0e40d30 100644
--- a/src/jsp/jsp/search.jsp
+++ b/src/jsp/jsp/search.jsp
@@ -1,4 +1,4 @@
-<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>
+<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <jsp:include page="header.jsf" flush="false" />
 <!--menu.jsp-->