diff --git a/source/org/thdl/tib/scanner/LocalTibetanScanner.java b/source/org/thdl/tib/scanner/LocalTibetanScanner.java
index 42bce24..b43949a 100644
--- a/source/org/thdl/tib/scanner/LocalTibetanScanner.java
+++ b/source/org/thdl/tib/scanner/LocalTibetanScanner.java
@@ -96,7 +96,7 @@ public class LocalTibetanScanner extends TibetanScanner
 				while (resultado == null && silSinDec!=null)
 				{
 					resultado = silAnterior.lookUp(silSinDec);
-					if (resultado == null)
+					if (resultado == null || !resultado.hasDef())
 					{
 						silSinDec += "\'";
 						resultado = silAnterior.lookUp(silSinDec);
@@ -133,7 +133,11 @@ public class LocalTibetanScanner extends TibetanScanner
 			while (resultado==null && silSinDec!=null)
 			{
 				resultado = silAnterior.lookUp(silSinDec);
-				if (resultado == null)
+				/*  here we don't have to worry about being in the middle of a
+				    word since the declension marks that it is the end of a
+				    word.
+				*/
+				if (resultado == null || !resultado.hasDef())
 				{
 					silSinDec += "\'";
 					resultado = silAnterior.lookUp(silSinDec);
diff --git a/source/org/thdl/tib/scanner/TibetanScanner.java b/source/org/thdl/tib/scanner/TibetanScanner.java
index 5d1e4eb..594c280 100644
--- a/source/org/thdl/tib/scanner/TibetanScanner.java
+++ b/source/org/thdl/tib/scanner/TibetanScanner.java
@@ -25,14 +25,15 @@ import org.thdl.util.*;
 */
 public abstract class TibetanScanner
 {
+    public static final String version = "The Tibetan to English Translation Tool, version 2.2.1 compiled on " + ThdlVersion.getTimeOfCompilation() + ". ";
 	public static final String copyrightUnicode="Copyright " + '\u00A9' + " 2000-2004 by Andr" + '\u00E9' + "s Montano Pellegrini, all rights reserved.";
 	public static final String copyrightASCII="Copyright 2000-2004 by Andres Montano Pellegrini, all rights reserved.";
-	public static final String copyrightHTML="<hr><small><strong>" + "The Tibetan to English Translation Tool: Version 2.2.0, compiled on " + ThdlVersion.getTimeOfCompilation() + ". Copyright &copy; 2000-2004 by <a href=\"http://www.people.virginia.edu/~am2zb/\" target=\"_blank\">Andr&eacute;s Montano Pellegrini.</a><br/>All rights reserved.</strong></small>";
+	public static final String copyrightHTML="<hr><small><strong>" + version + "Copyright &copy; 2000-2004 by <a href=\"http://www.people.virginia.edu/~am2zb/\" target=\"_blank\">Andr&eacute;s Montano Pellegrini.</a><br/>All rights reserved.</strong></small>";
 	public static final String aboutUnicode=
 	"Warning: Since version 1.3.0. the dictionary database format changed and " +
 	"is incompatible with previous versions. In order to use the newest version " +
 	"you have to re-build the dictionary database.\n\n" +
-	"The Tibetan to English Translation Tool, version 2.2.0, compiled on " + ThdlVersion.getTimeOfCompilation() + ". " +
+	version +
 	"Copyright " + '\u00A9' + " 2000-2004 Andr" + '\u00E9' + "s Montano Pellegrini, all rights reserved.\n\n" + 
 	"This software is protected by the terms of the AMP Open Community License, " +
 	"Version 1.0 (available at www.tibet.iteso.mx/Guatemala/). The Tibetan script " +