Imported Upstream version 1.6.1+dfsg

25 files changed, 1677 insertions, 3592 deletions

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index ee817ea..a8c1c8e 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -1,41 +1,26 @@
 AUTOMAKE_OPTIONS = 1.6
 SUBDIRS = diatheke
 INCLUDES = -I $(top_srcdir)/include
+if USE_INTERNAL_REGEX
+INCLUDES += -I$(top_srcdir)/include/internal/regex
+endif
 LDADD = $(top_builddir)/lib/libsword.la
 noinst_PROGRAMS = cipherraw lexdump \
 stepdump step2vpl gbfidx modwrite addvs emptyvss \
 addgb genbookutil treeidxutil
 
 bin_PROGRAMS = mod2imp mod2osis osis2mod tei2mod vs2osisref vs2osisreftxt mod2vpl \
-	mkfastmod vpl2mod imp2vs installmgr xml2gbs imp2gbs
-
-#if INSTALLMGR
-#IMGRPROG =
-#else
-#IMGRPROG = 
-#endif
-
+	mkfastmod vpl2mod imp2vs installmgr xml2gbs imp2gbs addld imp2ld
 
-#if ICU
-#ICUPROG = 
-#else
-#ICUPROG =
-#endif
 
-if ZLIB
-ZLIBPROG = mod2zmod addld imp2ld
+if HAVE_LIBZ
+ZLIBPROG = mod2zmod
 else
 ZLIBPROG =
 endif
 
-
-
-#noinst_PROGRAMS += $(ICUPROG)
 bin_PROGRAMS += $(ZLIBPROG) 
-#$(IMGRPROG)
 
-if ICU
-endif
 
 cipherraw_SOURCES = cipherraw.cpp
 lexdump_SOURCES = lexdump.c
@@ -61,14 +46,13 @@ vs2osisref_SOURCES = vs2osisref.cpp
 vs2osisreftxt_SOURCES = vs2osisreftxt.cpp
 genbookutil_SOURCES = genbookutil.cpp
 treeidxutil_SOURCES = treeidxutil.cpp
+addld_SOURCES = addld.cpp
+imp2ld_SOURCES = imp2ld.cpp
 
 installmgr_SOURCES = installmgr.cpp
-#installmgr_LDADD = -lcurl $(CURL_LIBS) $(LDADD)
 
-if ZLIB
+if HAVE_LIBZ
 mod2zmod_SOURCES = mod2zmod.cpp
-addld_SOURCES = addld.cpp
-imp2ld_SOURCES = imp2ld.cpp
 endif
 
 EXTRA_DIST = 
diff --git a/utilities/Makefile.in b/utilities/Makefile.in
index 9f7ac82..68910d3 100644
--- a/utilities/Makefile.in
+++ b/utilities/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -33,6 +35,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+@USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex
 noinst_PROGRAMS = cipherraw$(EXEEXT) lexdump$(EXEEXT) \
 	stepdump$(EXEEXT) step2vpl$(EXEEXT) gbfidx$(EXEEXT) \
 	modwrite$(EXEEXT) addvs$(EXEEXT) emptyvss$(EXEEXT) \
@@ -41,33 +44,30 @@ bin_PROGRAMS = mod2imp$(EXEEXT) mod2osis$(EXEEXT) osis2mod$(EXEEXT) \
 	tei2mod$(EXEEXT) vs2osisref$(EXEEXT) vs2osisreftxt$(EXEEXT) \
 	mod2vpl$(EXEEXT) mkfastmod$(EXEEXT) vpl2mod$(EXEEXT) \
 	imp2vs$(EXEEXT) installmgr$(EXEEXT) xml2gbs$(EXEEXT) \
-	imp2gbs$(EXEEXT) $(am__EXEEXT_1)
+	imp2gbs$(EXEEXT) addld$(EXEEXT) imp2ld$(EXEEXT) \
+	$(am__EXEEXT_1)
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/bcppmake/Makefile.am $(srcdir)/kylixmake/Makefile.am \
 	$(srcdir)/perl/Makefile.am
 subdir = utilities
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
-	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
-@ZLIB_TRUE@am__EXEEXT_1 = mod2zmod$(EXEEXT) addld$(EXEEXT) \
-@ZLIB_TRUE@	imp2ld$(EXEEXT)
+CONFIG_CLEAN_VPATH_FILES =
+@HAVE_LIBZ_TRUE@am__EXEEXT_1 = mod2zmod$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_addgb_OBJECTS = addgb.$(OBJEXT)
 addgb_OBJECTS = $(am_addgb_OBJECTS)
 addgb_LDADD = $(LDADD)
 addgb_DEPENDENCIES = $(top_builddir)/lib/libsword.la
-am__addld_SOURCES_DIST = addld.cpp
-@ZLIB_TRUE@am_addld_OBJECTS = addld.$(OBJEXT)
+am_addld_OBJECTS = addld.$(OBJEXT)
 addld_OBJECTS = $(am_addld_OBJECTS)
 addld_LDADD = $(LDADD)
 addld_DEPENDENCIES = $(top_builddir)/lib/libsword.la
@@ -95,8 +95,7 @@ am_imp2gbs_OBJECTS = imp2gbs.$(OBJEXT)
 imp2gbs_OBJECTS = $(am_imp2gbs_OBJECTS)
 imp2gbs_LDADD = $(LDADD)
 imp2gbs_DEPENDENCIES = $(top_builddir)/lib/libsword.la
-am__imp2ld_SOURCES_DIST = imp2ld.cpp
-@ZLIB_TRUE@am_imp2ld_OBJECTS = imp2ld.$(OBJEXT)
+am_imp2ld_OBJECTS = imp2ld.$(OBJEXT)
 imp2ld_OBJECTS = $(am_imp2ld_OBJECTS)
 imp2ld_LDADD = $(LDADD)
 imp2ld_DEPENDENCIES = $(top_builddir)/lib/libsword.la
@@ -128,7 +127,7 @@ mod2vpl_OBJECTS = $(am_mod2vpl_OBJECTS)
 mod2vpl_LDADD = $(LDADD)
 mod2vpl_DEPENDENCIES = $(top_builddir)/lib/libsword.la
 am__mod2zmod_SOURCES_DIST = mod2zmod.cpp
-@ZLIB_TRUE@am_mod2zmod_OBJECTS = mod2zmod.$(OBJEXT)
+@HAVE_LIBZ_TRUE@am_mod2zmod_OBJECTS = mod2zmod.$(OBJEXT)
 mod2zmod_OBJECTS = $(am_mod2zmod_OBJECTS)
 mod2zmod_LDADD = $(LDADD)
 mod2zmod_DEPENDENCIES = $(top_builddir)/lib/libsword.la
@@ -175,6 +174,7 @@ xml2gbs_DEPENDENCIES = $(top_builddir)/lib/libsword.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -203,17 +203,16 @@ SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \
 	$(tei2mod_SOURCES) $(treeidxutil_SOURCES) $(vpl2mod_SOURCES) \
 	$(vs2osisref_SOURCES) $(vs2osisreftxt_SOURCES) \
 	$(xml2gbs_SOURCES)
-DIST_SOURCES = $(addgb_SOURCES) $(am__addld_SOURCES_DIST) \
-	$(addvs_SOURCES) $(cipherraw_SOURCES) $(emptyvss_SOURCES) \
-	$(gbfidx_SOURCES) $(genbookutil_SOURCES) $(imp2gbs_SOURCES) \
-	$(am__imp2ld_SOURCES_DIST) $(imp2vs_SOURCES) \
-	$(installmgr_SOURCES) $(lexdump_SOURCES) $(mkfastmod_SOURCES) \
-	$(mod2imp_SOURCES) $(mod2osis_SOURCES) $(mod2vpl_SOURCES) \
-	$(am__mod2zmod_SOURCES_DIST) $(modwrite_SOURCES) \
-	$(osis2mod_SOURCES) $(step2vpl_SOURCES) $(stepdump_SOURCES) \
-	$(tei2mod_SOURCES) $(treeidxutil_SOURCES) $(vpl2mod_SOURCES) \
-	$(vs2osisref_SOURCES) $(vs2osisreftxt_SOURCES) \
-	$(xml2gbs_SOURCES)
+DIST_SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \
+	$(cipherraw_SOURCES) $(emptyvss_SOURCES) $(gbfidx_SOURCES) \
+	$(genbookutil_SOURCES) $(imp2gbs_SOURCES) $(imp2ld_SOURCES) \
+	$(imp2vs_SOURCES) $(installmgr_SOURCES) $(lexdump_SOURCES) \
+	$(mkfastmod_SOURCES) $(mod2imp_SOURCES) $(mod2osis_SOURCES) \
+	$(mod2vpl_SOURCES) $(am__mod2zmod_SOURCES_DIST) \
+	$(modwrite_SOURCES) $(osis2mod_SOURCES) $(step2vpl_SOURCES) \
+	$(stepdump_SOURCES) $(tei2mod_SOURCES) $(treeidxutil_SOURCES) \
+	$(vpl2mod_SOURCES) $(vs2osisref_SOURCES) \
+	$(vs2osisreftxt_SOURCES) $(xml2gbs_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -223,10 +222,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_CXXFLAGS = @AM_CXXFLAGS@
@@ -246,7 +273,6 @@ CPPFLAGS = @CPPFLAGS@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CURL_AM_CFLAGS = @CURL_AM_CFLAGS@
 CURL_CONFIG = @CURL_CONFIG@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
@@ -258,13 +284,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 GENCCODE = @GENCCODE@
 GENCMN = @GENCMN@
 GENRB = @GENRB@
@@ -278,23 +305,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -310,14 +332,13 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-XML_LIBS = @XML_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -351,7 +372,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -375,26 +395,14 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_conf = @with_conf@
 with_icu = @with_icu@
+with_icusword = @with_icusword@
 with_zlib = @with_zlib@
 AUTOMAKE_OPTIONS = 1.6
 SUBDIRS = diatheke
-INCLUDES = -I $(top_srcdir)/include
+INCLUDES = -I $(top_srcdir)/include $(am__append_1)
 LDADD = $(top_builddir)/lib/libsword.la
-@ZLIB_FALSE@ZLIBPROG = 
-
-#if INSTALLMGR
-#IMGRPROG =
-#else
-#IMGRPROG = 
-#endif
-
-#if ICU
-#ICUPROG = 
-#else
-#ICUPROG =
-#endif
-@ZLIB_TRUE@ZLIBPROG = mod2zmod addld imp2ld
-#$(IMGRPROG)
+@HAVE_LIBZ_FALSE@ZLIBPROG = 
+@HAVE_LIBZ_TRUE@ZLIBPROG = mod2zmod
 cipherraw_SOURCES = cipherraw.cpp
 lexdump_SOURCES = lexdump.c
 lexdump_LDADD = -lstdc++
@@ -419,11 +427,10 @@ vs2osisref_SOURCES = vs2osisref.cpp
 vs2osisreftxt_SOURCES = vs2osisreftxt.cpp
 genbookutil_SOURCES = genbookutil.cpp
 treeidxutil_SOURCES = treeidxutil.cpp
+addld_SOURCES = addld.cpp
+imp2ld_SOURCES = imp2ld.cpp
 installmgr_SOURCES = installmgr.cpp
-#installmgr_LDADD = -lcurl $(CURL_LIBS) $(LDADD)
-@ZLIB_TRUE@mod2zmod_SOURCES = mod2zmod.cpp
-@ZLIB_TRUE@addld_SOURCES = addld.cpp
-@ZLIB_TRUE@imp2ld_SOURCES = imp2ld.cpp
+@HAVE_LIBZ_TRUE@mod2zmod_SOURCES = mod2zmod.cpp
 EXTRA_DIST = $(swbcppmakedir)/imp2ld.bpf $(swbcppmakedir)/mod2imp.bpf \
 	$(swbcppmakedir)/osis2mod.bpf $(swbcppmakedir)/utilities.bpg \
 	$(swbcppmakedir)/imp2ld.bpr $(swbcppmakedir)/mod2imp.bpr \
@@ -463,9 +470,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/bc
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  utilities/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  utilities/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign utilities/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign utilities/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -483,41 +490,59 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 addgb$(EXEEXT): $(addgb_OBJECTS) $(addgb_DEPENDENCIES) 
 	@rm -f addgb$(EXEEXT)
 	$(CXXLINK) $(addgb_OBJECTS) $(addgb_LDADD) $(LIBS)
@@ -636,42 +661,42 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -706,7 +731,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -740,16 +765,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -764,7 +789,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -776,7 +801,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -785,29 +810,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -828,29 +858,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -883,6 +928,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -904,6 +950,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -912,18 +960,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -946,8 +1004,8 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-binPROGRAMS \
@@ -965,6 +1023,7 @@ uninstall-am: uninstall-binPROGRAMS
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/utilities/addld.cpp b/utilities/addld.cpp
index 85ab1ec..e6b8872 100644
--- a/utilities/addld.cpp
+++ b/utilities/addld.cpp
@@ -92,6 +92,7 @@ int main(int argc, char **argv) {
       mod.setEntry(buffer, entrysize);	// save text to module at current position
     }
     else if (compress) {
+#ifndef EXCLUDEZLIB
       char buffer[1048576];  //this is the max size of any entry
       zLD mod(argv[2], 0, 0, 200, new ZipCompress());	// open our datapath with our RawText driver.
       SWKey* key = mod.CreateKey();
@@ -109,6 +110,10 @@ int main(int argc, char **argv) {
       
       entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile);
       mod.setEntry(buffer, entrysize);	// save text to module at current position
+#else
+      fprintf(stderr, "error: %s: SWORD library not built with ZIP compression support.\n", argv[0]);
+      exit(-3);
+#endif
     }
     else {
       char buffer[65536];  //this is the max size of any entry
diff --git a/utilities/diatheke/Makefile.am b/utilities/diatheke/Makefile.am
index 51a30c6..8ba34e5 100644
--- a/utilities/diatheke/Makefile.am
+++ b/utilities/diatheke/Makefile.am
@@ -1,23 +1,12 @@
 AUTOMAKE_OPTIONS = 1.6
 
-INCLUDES = -I$(top_srcdir)/include
+LDADD = $(top_builddir)/lib/libsword.la
 
 bin_PROGRAMS = diatheke
 
 diatheke_SOURCES = diatheke.cpp corediatheke.cpp diathekemgr.cpp \
 	diafiltmgr.cpp thmlcgi.cpp gbfcgi.cpp osiscgi.cpp
 
-if ICU
-iculibs = -licui18n -licuuc
-endif
-
-if USELUCENE
-lucenelibs = -lclucene
-endif
-
-diatheke_LDADD = $(top_builddir)/lib/libsword.la \
-	$(iculibs) $(lucenelibs)
-
 noinst_HEADERS = corediatheke.h diafiltmgr.h diathekemgr.h gbfcgi.h thmlcgi.h \
 	osiscgi.h
 
diff --git a/utilities/diatheke/Makefile.in b/utilities/diatheke/Makefile.in
index fa59942..6139bb3 100644
--- a/utilities/diatheke/Makefile.in
+++ b/utilities/diatheke/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -40,28 +42,26 @@ DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
 subdir = utilities/diatheke
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
-	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_diatheke_OBJECTS = diatheke.$(OBJEXT) corediatheke.$(OBJEXT) \
 	diathekemgr.$(OBJEXT) diafiltmgr.$(OBJEXT) thmlcgi.$(OBJEXT) \
 	gbfcgi.$(OBJEXT) osiscgi.$(OBJEXT)
 diatheke_OBJECTS = $(am_diatheke_OBJECTS)
-am__DEPENDENCIES_1 =
-diatheke_DEPENDENCIES = $(top_builddir)/lib/libsword.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+diatheke_LDADD = $(LDADD)
+diatheke_DEPENDENCIES = $(top_builddir)/lib/libsword.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -96,7 +96,6 @@ CPPFLAGS = @CPPFLAGS@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CURL_AM_CFLAGS = @CURL_AM_CFLAGS@
 CURL_CONFIG = @CURL_CONFIG@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
@@ -108,13 +107,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 GENCCODE = @GENCCODE@
 GENCMN = @GENCMN@
 GENRB = @GENRB@
@@ -128,23 +128,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -160,14 +155,13 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-XML_LIBS = @XML_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -201,7 +195,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -225,23 +218,19 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_conf = @with_conf@
 with_icu = @with_icu@
+with_icusword = @with_icusword@
 with_zlib = @with_zlib@
 AUTOMAKE_OPTIONS = 1.6
-INCLUDES = -I$(top_srcdir)/include
+LDADD = $(top_builddir)/lib/libsword.la
 diatheke_SOURCES = diatheke.cpp corediatheke.cpp diathekemgr.cpp \
 	diafiltmgr.cpp thmlcgi.cpp gbfcgi.cpp osiscgi.cpp
 
-@ICU_TRUE@iculibs = -licui18n -licuuc
-@USELUCENE_TRUE@lucenelibs = -lclucene
-diatheke_LDADD = $(top_builddir)/lib/libsword.la \
-	$(iculibs) $(lucenelibs)
-
 noinst_HEADERS = corediatheke.h diafiltmgr.h diathekemgr.h gbfcgi.h thmlcgi.h \
 	osiscgi.h
 
 swcgidir = $(top_srcdir)/utilities/diatheke/cgi
 EXTRA_DIST = $(swcgidir)/dia-def.pl $(swcgidir)/diatheke.pl \
-	$(swcgidir)/index-private.html $(swcgidir)/index-public.html
+	$(swcgidir)/index.html
 all: all-am
 
 .SUFFIXES:
@@ -255,9 +244,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/cg
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  utilities/diatheke/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  utilities/diatheke/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign utilities/diatheke/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign utilities/diatheke/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -275,34 +264,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 diatheke$(EXEEXT): $(diatheke_OBJECTS) $(diatheke_DEPENDENCIES) 
 	@rm -f diatheke$(EXEEXT)
 	$(CXXLINK) $(diatheke_OBJECTS) $(diatheke_LDADD) $(LIBS)
@@ -323,21 +328,21 @@ distclean-compile:
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -360,7 +365,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -368,29 +373,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -411,13 +421,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -448,6 +462,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -468,6 +483,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -476,18 +493,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -526,6 +553,7 @@ uninstall-am: uninstall-binPROGRAMS
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/utilities/diatheke/cgi/Makefile.am b/utilities/diatheke/cgi/Makefile.am
index 237aefd..e006304 100644
--- a/utilities/diatheke/cgi/Makefile.am
+++ b/utilities/diatheke/cgi/Makefile.am
@@ -2,5 +2,4 @@ swcgidir = $(top_srcdir)/utilities/diatheke/cgi
 
 EXTRA_DIST = $(swcgidir)/dia-def.pl
 EXTRA_DIST += $(swcgidir)/diatheke.pl
-EXTRA_DIST += $(swcgidir)/index-private.html
-EXTRA_DIST += $(swcgidir)/index-public.html
+EXTRA_DIST += $(swcgidir)/index.html
diff --git a/utilities/diatheke/cgi/index-private.html b/utilities/diatheke/cgi/index-private.html
deleted file mode 100644
index 6afbc91..0000000
--- a/utilities/diatheke/cgi/index-private.html
+++ /dev/null
@@ -1,1264 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Diatheke Online Bible</title>
-</head>
-
-<body>
-
-<form method="get" action="cgi-bin/diatheke.pl">
-  <p /> <font face="Arial, Helvetica, sans-serif">Verse or Search key:</font> 
-    <input type="text" name="verse" size="20">
-    <input type="submit" name="Submit" value="Submit">
-    <input type="reset" name="Reset" value="Reset">
-    <br />
-    <br />
-    <input type="radio" name="search" checked value="" />
-    <font face="Arial, Helvetica, sans-serif">Verse/Commentary Lookup</font> <br />
-    <input type="radio" name="search" value="phrase" />
-    <font face="Arial, Helvetica, sans-serif">Phrase Search</font><br />
-    <input type="radio" name="search" value="multiword" />
-    <font face="Arial, Helvetica, sans-serif">Multiple Word Search</font><br />
-    <input type="radio" name="search" value="regex" />
-    <font face="Arial, Helvetica, sans-serif">Regular Expression Search<br>
-    <br>
-    </font>
-  <table width="100%" border="0">
-    <tr> 
-      <td width="50%"> 
-        <input type="checkbox" name="strongs" value="on" checked>
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Strong's Numbers</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="headings" value="on" checked>
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Section Headings</font></td>
-    </tr>
-    <tr> 
-      <td width="50%"> 
-        <input type="checkbox" name="footnotes" value="on" checked>
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Footnotes</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="scriprefs" value="on" checked>
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Scripture Cross-References</font></td>
-    </tr>
-    <tr> 
-      <td width="50%"> 
-        <input type="checkbox" name="morph" value="on" checked>
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Morphology</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="hebvowels" value="on" checked>
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Hebrew Vowels</font></td>
-    </tr>
-    <tr> 
-      <td width="50%">
-        <input type="checkbox" name="lemmas" value="on" checked>
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Lemmas</font></td>
-      <td width="50%">
-        <input type="checkbox" name="hebcant" value="on">
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Hebrew Cantillation 
-        Marks </font></td>
-    </tr>
-    <tr> 
-      <td width="50%">
-        <input type="checkbox" name="latinxlit" value="on">
-        <font face="Arial, Helvetica, sans-serif" size="-1">Latin Transliterate</font> 
-      </td>
-      <td width="50%">
-        <input type="checkbox" name="grkacc" value="on" checked>
-        <font size="-1" face="Arial, Helvetica, sans-serif">Show Greek Accents</font> 
-      </td>
-    </tr>
-  </table>
-  <br>
-  <table BORDER="0" WIDTH="100%">
-    <tr> 
-      <td width="50%"><font face=Times New Roman, Times, serif><b>English Biblical 
-        Texts:</b></font><br />
-      </td>
-      <td width="50%"><font face=Times New Roman, Times, serif><b>Non-English 
-        Biblical Texts:</b></font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="AKJV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>American King James 
-        Version (AKJV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="ALB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Albanian Bible (ALB)</font> 
-      </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="ALT" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Analytical-Literal 
-        Translation (ALT)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="Afr1953" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1953 Afrikaans Bybel 
-        (Afr1953)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="ASV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1901 American Standard 
-        Version (ASV)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="Afr1983" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1983 Afrikaans Bybel 
-        (Afr1983)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="BBE" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1965 Bible in Basic 
-        English (BBE)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="AraSVD" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Smith & Van Dyke Arabic 
-        Bible (AraSVD)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="BWE" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Bible in Worldwide 
-        English (BWE)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="ChiGU" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Chinese Glory Union 
-        Bible (ChiGU)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Brenton" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Brenton's English Translation 
-        of the Septuagint (Brenton)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="CzeBKR" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Czech Bible Kralicka 
-        (CzeBKR)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Common" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>The Common Edition: 
-        New Testament (Common)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="CzeCEP" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Czech Ekumenicky Cesky 
-        preklad (CzeCEP)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="DR" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Douay-Rheims Bible 
-        (DR)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="CzeKMS" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Czech Preklad KMS Nova 
-        smlouva (CzeKMS)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="DRA" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Douay-Rheims 1899 American 
-        Edition (DRA)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="CzeNKB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Czech Nova kralicka 
-        Bible (CzeNKB)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Darby" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1889 Darby Bible (Darby)</font> 
-      </td>
-      <td width="50%"> 
-        <input type="checkbox" name="Dan" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Danske Bibel (Dan)</font> 
-      </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="GodsWord" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>GOD'S WORD Translation 
-        (GodsWord)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="DutLEI" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Dutch Leidse Vertaling 
-        (DutLEI)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="HNV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Hebrew Names Version 
-        of the World English Bible (HNV)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="DutLU" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Dutch Lutherse Vertaling 
-        (DutLU)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="IGNT" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Interlinear Greek New 
-        Testament (IGNT)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="DutNBG" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Dutch Netherlands Bijbelgenootschap 
-        Vertaling 1951 (DutNBG)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="ISV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>International Standard 
-        Version (ISV)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="DutPALM" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Dutch PALM-editie NT 
-        (DutPALM)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="JPS" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Jewish Publication 
-        Society Old Testament (JPS)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="DutSVV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Dutch Statenvertaling 
-        (DutSVV)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="KJ21" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>21st Century King James 
-        Version (KJ21)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="EquShr" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Equadorian Shuar NT 
-        (EquShr)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="KJV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>King James Version 
-        of 1611 w/ Strongs Numbers (KJV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Esperanto" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Esperanto Bible (Esperanto)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="LITV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Green's Literal Translation 
-        (LITV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="FinPR" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Finnish 1938 PhyZ Raamattu 
-        (FinPR)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="LO" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>The Living Oracles 
-        NT (LO)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="FreBFC" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>French Bible en francais 
-        courant, edition revisee (FreBFC)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="MKJV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Green's Modern King 
-        James Version (MKJV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="FreBJ" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>French Bible de Jerusalem 
-        (FreBJ)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Montgomery" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Montgomery New Testament 
-        (Montgomery)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="FreCrl" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>French Haitian Creole 
-        Version (FreCrl)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Murdock" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>James Murdock's Translation 
-        of the Syriac Peshitta (Murdock)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="FreDrb" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>French Darby Version 
-        (FreDrb)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NAB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New American Bible 
-        (NAB)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="FreLSG" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>French 1910 Louis Segond 
-        (FreLSG)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NASB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New American Standard 
-        Bible (NASB)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="FreNEG" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>French Nouvelle Edition 
-        de Geneve 1979 (FreNEG)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NASB95" value="on">
-        <font size="-1" face=Times New Roman, Times, serif> New American Standard 
-        Bible 1995 Update (NASB95)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="FreTOB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>French Traduction oecumenique 
-        de la Bible (FreTOB)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NCV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New Century Version 
-        (NCV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="GerBen" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>German Bengel NT (GerBen)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NIV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New International Version 
-        (NIV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="GerEin" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>German Einheitsuebersetzung 
-        der Heilegen Schrift (GerEin)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NIVBr" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New International Version, 
-        British Edition (NIVBr)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="GerElb" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>German Darby Unrevidierte 
-        Elberfelder 1905 (GerElb)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NJB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New Jerusalem Bible 
-        (NJB)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="GerLut" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>German 1912 Luther 
-        (GerLut)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NKJV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New King James Version 
-        (NKJV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="GerLut1545" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>German 1545 Luther 
-        (GerLut1545)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NLT" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New Living Translation 
-        (NLT)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="GerRElb" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>German Elberfelder 
-        Bibel revidierte Fassung 1993 (GerRElb)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="NRSV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>New Revised Standard 
-        Version (NRSV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="GerRLut" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>German Revised Lutherbibel 
-        1984 (GerRLut)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="ORTHJBC" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>The Orthodox Jewish 
-        Brit Chadasha (ORTHJBC)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="GerSch" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>German 1951 Schlachter 
-        Bibel (GerSch)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Phillips" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>J B Phillips New Testament 
-        (Phillips)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="GothicA" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Gothic Codex Ambr. 
-        A & Mss. (GothicA)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="RNKJV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Restored Name King 
-        James Version (RNKJV)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="GothicB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Gothic Codex Ambr. 
-        B & Car. (GothicB)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="RSV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Revised Standard Version 
-        (RSV)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="HunKar" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Hungarian Karoli (HunKar)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="RWebster" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Revised 1833 Webster 
-        Version (RWebster)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Icelandic" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Icelandic Bible (Icelandic)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Rotherham" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>The Emphasized Bible 
-        by J. B. Rotherham (Rotherham)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="IndBIS" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Indonesian Bahasa Indonesia 
-        Sehari-hari (IndBIS)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="TEV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Todays English Version 
-        (Good News Bible) 1966 and 1976 (TEV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="IndTB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Indonesian Terjemahan 
-        Baru (IndTB)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="TMB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Third Millenium Bible 
-        (TMB)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="IndTL" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Indonesian Terjemahan 
-        Baru (IndTL)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Twenty" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Twentieth Century New 
-        Testament (Twenty)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="ItaIEP" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Italian NVB Nuovissima 
-        Versione della Bibbbia San Paolo Edizione (ItaIEP)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="WEB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>World English Bible 
-        (WEB)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="ItaLND" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Italian 1991 La Nuova 
-        Diodati (ItaLND)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Websters" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Webster Bible (Websters)</font> 
-      </td>
-      <td width="50%"> 
-        <input type="checkbox" name="ItaNRV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Italian 1994 La Sacra 
-        Bibbia Nuova Riveduta (ItaNRV)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Weymouth" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1912 Weymouth NT (Weymouth)</font> 
-      </td>
-      <td width="50%"> 
-        <input type="checkbox" name="JapKUG" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Japanese JKUG Translation 
-        (JapKUG)</font> </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="YLT" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1898 Young's Literal 
-        Translation (YLT)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="JapSNKI" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Japanese JSNKI Translation 
-        (JapSNKI)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%">&nbsp; </td>
-      <td width="50%"> 
-        <input type="checkbox" name="Ketchi" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Ketchi Bible (Ketchi)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"><font face=Times New Roman, Times, serif><b>Unorthodox or 
-        Heretical Biblical Texts:</b></font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="Korean" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Korean Bible (Korean)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="CLNT" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Concordant Literal 
-        New Testament (CLNT)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="Latvian" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Latvian New Testament 
-        (Latvian)</font> </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Diaglott" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>The Emphatic Diaglott 
-        (Diaglott)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="ManxGaelic" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Manx Gaelic Scripture 
-        Portions (ManxGaelic)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="JST" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Joseph Smith Translation 
-        (JST)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Maori" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Maori Bible (Maori)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="RVIC" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Revised Version, Improved 
-        and Corrected (RVIC)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Mel" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Melanesian Pidgin Bible 
-        (Mel)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%">&nbsp; </td>
-      <td width="50%"> 
-        <input type="checkbox" name="NorBok" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Norwegian 1930 Bokmal 
-        (NorBok)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"><font face=Times New Roman, Times, serif><b>Original Language 
-        Biblical Texts:</b></font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="NorN38" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Norwegian 1938 Nynorsk 
-        (NorN38)</font></td>
-    </tr>
-    <tr> 
-      <td width="51%"> 
-        <input type="checkbox" name="LXX" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Septuagint (LXX)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="NorNBK" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Norwegian Bibel Konkordant 
-        (NorNBK)</font></td>
-    </tr>
-    <tr> 
-      <td width="51%"> 
-        <input type="checkbox" name="LXXM" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Septuagint, Morphologically 
-        Tagged Rahlfs' (LXXM)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="NorNyn" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Norwegian 1994 Nynorsk 
-        (NorNyn)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="N27U4" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Nestle Aland 27th Ed./ 
-        UBS 4th Ed. Greek Text (N27U4)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="Norsk" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Norsk Bibelen (Norsk)</font></td>
-    </tr>
-    <tr> 
-      <td width="51%"> 
-        <input type="checkbox" name="BHS" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Biblia Hebraica Stuttgartensia 
-        (BHS)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="PhiCEB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Philippine Nga Cebuano 
-        (PhiCEB)</font> </td>
-    </tr>
-    <tr> 
-      <td width="51%"> 
-        <input type="checkbox" name="Byz" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1991 Byzantine/Majority 
-        Text (Byz)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="PolBTP" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Polish Millenium Bible 
-        1984, 4th Ed. (PolBTP)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Scrivner" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1894 Scrivener Textus 
-        Receptus (Scrivner)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="PorAA" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Portuguese Joao Ferreira 
-        de Almeida Atualizada (PorAA)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Stephanus" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1550 Stephanus Textus 
-        Receptus (Stephanus)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="PorACF" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Brazillian Portuguese 
-        Joao Ferreira de Almeida, Corrigada Fiel 1995 (PorACF)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Tisch" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Tischendorf's Eighth 
-        Edition GNT (Tisch)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="PorBRP" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Portuguese 1994 Almeida 
-        Biblia (PorBRP)</font></td>
-    </tr>
-    <tr> 
-      <td width="51%"> 
-        <input type="checkbox" name="Vulgate" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Latin Vulgate (Vulgate)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="PorRA" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Portuguese Almeida 
-        Revista e Atualizada (PorRA)</font></td>
-    </tr>
-    <tr> 
-      <td width="51%"> 
-        <input type="checkbox" name="Vulgate_HebPs" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Latin Vulgate Psalms 
-        from Hebrew (Vulgate_HebPs)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="PorRC" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Portuguese Almeida 
-        Revista e Corrigida (PorRC)</font></td>
-    </tr>
-    <tr> 
-      <td width="51%"> 
-        <input type="checkbox" name="WH" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1881 Westcott-Hort 
-        Greek Text (WH)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="RST" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Russian Synodal Translation 
-        (RST)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="WHNU" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Westcott-Hort with 
-        NA27U4 variants (WHNU)</font> </td>
-      <td width="50%"> 
-        <input type="checkbox" name="RomCor" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Romanian Cornilescu 
-        Version (RomCor)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%">&nbsp;</td>
-      <td width="50%"> 
-        <input type="checkbox" name="Romani" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Romani (Gypsy) New 
-        Testament (Romani)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"><font face=Times New Roman, Times, serif><b>Commentaries:</b></font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Sango" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Le Sainte Bible en 
-        sango, 1996 (Sango)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="AudioKJV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>KJV Audio Bible read 
-        by James Scourby (AudioKJV)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="ScotsGaelic" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Scots Gaelic Gospel 
-        of Mark (ScotsGaelic)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Barnes" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Barnes' New Testament 
-        Notes (Barnes)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SpaLBA" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Spanish La Biblia de 
-        Las Americas (SpaLBA)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Clarke" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Adam Clarke's Commentary 
-        on the Bible (Clarke)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SpaRV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Spanish Reina-Valera 
-        (SpaRV)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="DTN" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Darby Translation Notes 
-        (DTN)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SpaRV60" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Spanish Reina-Valera 
-        Revised 1960 (SpaRV60)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Family" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Family Bible Notes 
-        (Family)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SpaRV95" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Spanish Reina-Valera 
-        Update 1995 (SpaRV95)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Geneva" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Geneva Bible Translation 
-        Notes (Geneva)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SpaRVA" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Spanish Version Reina-Valera 
-        Actualizada (SpaRVA)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Gill" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>John Gill's Expositor 
-        (Gill)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SpaSEV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Spanish 1569 Sagradas 
-        Escrituras Version Antigua (SpaSEV)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="JFB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Jamieson Fausset Brown 
-        Bible Commentary (JFB)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SpaVNT" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Spanish 1858 Valera 
-        New Testament (SpaVNT)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="MAK" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Matthias Ansorgs Kommentar 
-        (MAK)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Swahili" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Swahili New Testament 
-        (Swahili)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="MHC" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Matthew Henry's Complete 
-        Commentary on the Whole Bible (MHC)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SweSVE" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Swedish Bible 1917 
-        New Testament (SweSVE)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="MHCC" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Matthew Henry's Concise 
-        Commentary on the Whole Bible (MHCC)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Tagalog" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Tagalog (John & James) 
-        (Tagalog)</font> </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="PNT" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>The People's New Testament 
-        (PNT)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Tamil" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Tamil Bible (Tamil)</font> 
-      </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Personal" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Personal Commentary 
-        (Personal)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="ThaiKJV" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Thai KJV (ThaiKJV)</font> 
-      </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="RWP" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Robertson's Word Pictures 
-        (RWP)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Turkish" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Turkish NT (Turkish)</font> 
-      </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Rieger" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Carl Heinrich Riegers 
-        Kommentar (Rieger)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="UMGreek" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Unaccented Modern Greek 
-        Text (UMGreek)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="TDavid" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>C. H. Spurgeon's Treasury 
-        of David (TDavid)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Ukrainian" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Ukrainian Bible (Ukrainian)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="TFG" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>The Fourfold Gospel 
-        and Commentary on Acts of Apostles (TFG)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Uma" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Uma New Testament (Uma)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="TSK" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Treasury of Scriptural 
-        Knowledge (TSK)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Viet" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1934 Vietnamese Bible 
-        (Viet)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Wesley" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>John Wesley's Notes 
-        on the Bible (Wesley)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Xhosa" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Xhosa Bible (Xhosa)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%">&nbsp;</td>
-      <td width="50%">&nbsp; </td>
-    </tr>
-    <tr> 
-      <td width="48%"><font face=Times New Roman, Times, serif><b>Dictionaries 
-        & Lexica:</b></font></td>
-      <td width="50%"><font face=Times New Roman, Times, serif><b>Daily Devotionals:</b></font> 
-      </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="AmTract" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>American Tract Society 
-        Bible Dictionary (AmTract)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="Daily" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Jonathan Bagster's 
-        Daily Light on the Daily Path (Daily)</font> </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="BDB" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Brown-Driver-Briggs 
-        Hebrew Lexicon (BDB)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="SME" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>C. H. Spurgeon's Morning 
-        and Evening: Daily Readins (SME)</font> </td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Eastons" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Easton's Bible Dictionary 
-        (Eastons)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_89" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1989 Losung auf deutsch 
-        (losung_de_89)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Hitchcocks" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Hitchcock's Bible Names 
-        (Hitchcocks)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_90" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1990 Losung auf deutsch 
-        (losung_de_90)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="ISBE" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>International Standard 
-        Bible Encyclopedia (ISBE)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_91" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1991 Losung auf deutsch 
-        (losung_de_91)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Naves" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Nave's Topical Bible 
-        (Naves)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_92" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1992 Losung auf deutsch 
-        (losung_de_92)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Packard" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Packard's Morphological 
-        Analysis Codes (Packard)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_93" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1993 Losung auf deutsch 
-        (losung_de_93)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Smiths" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Smith's Bible Dictionary 
-        (Smiths)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_94" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1994 Losung auf deutsch 
-        (losung_de_94)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="StrongsGreek" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Strong's Greek Bible 
-        Dictionary (StrongsGreek)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_95" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1995 Losung auf deutsch 
-        (losung_de_95)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="StrongsHebrew" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Strong's Hebrew Bible 
-        Dictionary (StrongsHebrew)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_96" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1996 Losung auf deutsch 
-        (losung_de_96)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Thayer" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Thayer's Greek Lexicon 
-        (Thayer)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_97" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1997 Losung auf deutsch 
-        (losung_de_97)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="Torrey" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>R. A. Torrey's New 
-        Topical Textbook (Torrey)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_98" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1998 Losung auf deutsch 
-        (losung_de_98)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%" height="23"> 
-        <input type="checkbox" name="Vines" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Vines Bible Dictionary 
-        (Vines)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_de_99" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1999 Losung auf deutsch 
-        (losung_de_99)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%"> 
-        <input type="checkbox" name="WebstersDict" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>Webster's Revised Unabridged 
-        Dictionary 1913 (WebstersDict)</font></td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_en_96" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1996 Watchwords (Losung) 
-        in English (losung_en_96)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%" height="23">&nbsp;</td>
-      <td width="50%" height="23"> 
-        <input type="checkbox" name="losung_en_97" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1997 Watchwords (Losung) 
-        in English (losung_en_97)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%">&nbsp;</td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_en_98" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1998 Watchwords (Losung) 
-        in English (losung_en_98)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%">&nbsp; </td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_en_99" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1999 Watchwords (Losung) 
-        in English (losung_en_99)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%">&nbsp; </td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_es_99" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1999 Watchwords (Losung) 
-        en Castellano (losung_es_99)</font></td>
-    </tr>
-    <tr> 
-      <td width="48%">&nbsp;</td>
-      <td width="50%"> 
-        <input type="checkbox" name="losung_nl_99" value="on">
-        <font size="-1" face=Times New Roman, Times, serif>1999 Watchwords (Losung) 
-        in Dutch (losung_nl_99)</font></td>
-    </tr>
-  </table>
-</form>
-
-<form method="get" action="cgi-bin/dia-def.pl">
-  Select default Bible version for cross-references:&nbsp;<select name="defversion" size="1">
-  
-<option value="AKJV">American King James Version (AKJV)</option>
-<option value="ALB">Albanian Bible (ALB)</option>
-<option value="ALT">Analytical-Literal Translation (ALT)</option>
-<option value="ASV">1901 American Standard Version (ASV)</option>
-<option value="Afr1953">1953 Afrikaans Bybel (Afr1953)</option>
-<option value="Afr1983">1983 Afrikaans Bybel (Afr1983)</option>
-<option value="AraSVD">Smith & Van Dyke Arabic Bible (AraSVD)</option>
-<option value="BBE">1965 Bible in Basic English (BBE)</option>
-<option value="BHS">Biblia Hebraica Stuttgartensia (BHS)</option>
-<option value="BWE">Bible in Worldwide English (BWE)</option>
-<option value="Brenton">Brenton's English Translation of the Septuagint (Brenton)</option>
-<option value="Byz">1991 Byzantine/Majority Text (Byz)</option>
-<option value="CLNT">Concordant Literal New Testament (CLNT)</option>
-<option value="ChiGU">Chinese Glory Union Bible (ChiGU)</option>
-<option value="Common">The Common Edition: New Testament (Common)</option>
-<option value="CzeBKR">Czech Bible Kralicka (CzeBKR)</option>
-<option value="CzeCEP">Czech Ekumenicky Cesky preklad (CzeCEP)</option>
-<option value="CzeKMS">Czech Preklad KMS Nova smlouva (CzeKMS)</option>
-<option value="CzeNKB">Czech Nova kralicka Bible (CzeNKB)</option>
-<option value="DR">Douay-Rheims Bible (DR)</option>
-<option value="DRA">Douay-Rheims 1899 American Edition (DRA)</option>
-<option value="Dan">Danske Bibel (Dan)</option>
-<option value="Darby">1889 Darby Bible (Darby)</option>
-<option value="Diaglott">The Emphatic Diaglott (Diaglott)</option>
-<option value="DutLEI">Dutch Leidse Vertaling (DutLEI)</option>
-<option value="DutLU">Dutch Lutherse Vertaling (DutLU)</option>
-<option value="DutNBG">Dutch Netherlands Bijbelgenootschap Vertaling 1951 (DutNBG)</option>
-<option value="DutPALM">Dutch PALM-editie NT (DutPALM)</option>
-<option value="DutSVV">Dutch Statenvertaling (DutSVV)</option>
-<option value="EquShr">Equadorian Shuar NT (EquShr)</option>
-<option value="Esperanto">Esperanto Bible (Esperanto)</option>
-<option value="FinPR">Finnish 1938 PhyZ Raamattu (FinPR)</option>
-<option value="FreBFC">French Bible en francais courant, edition revisee (FreBFC)</option>
-<option value="FreBJ">French Bible de Jerusalem (FreBJ)</option>
-<option value="FreCrl">French Haitian Creole Version (FreCrl)</option>
-<option value="FreDrb">French Darby Version (FreDrb)</option>
-<option value="FreLSG">1910 Louis Segond (FreLSG)</option>
-<option value="FreNEG">French Nouvelle Edition de Geneve 1979 (FreNEG)</option>
-<option value="FreTOB">French Traduction oecumenique de la Bible (FreTOB)</option>
-<option value="GerBen">German Bengel NT (GerBen)</option>
-<option value="GerEin">German Einheitsuebersetzung der Heilegen Schrift (GerEin)</option>
-<option value="GerElb">German Darby Unrevidierte Elberfelder 1905 (GerElb)</option>
-<option value="GerLut">German 1912 Luther (GerLut)</option>
-<option value="GerLut1545">German 1545 Luther (GerLut1545)</option>
-<option value="GerRElb">German Elberfelder Bibel revidierte Fassung 1993 (GerRElb)</option>
-<option value="GerRLut">German Revised Lutherbibel 1984 (GerRLut)</option>
-<option value="GerSch">German 1951 Schlachter Bibel (GerSch)</option>
-<option value="GodsWord">GOD'S WORD Translation (GodsWord)</option>
-<option value="GothicA">Gothic Codex Ambr. A & Mss. (GothicA)</option>
-<option value="GothicB">Gothic Codex Ambr. B & Car. (GothicB)</option>
-<option value="HNV">Hebrew Names Version of the World English Bible (HNV)</option>
-<option value="HunKar">Hungarian Karoli (HunKar)</option>
-<option value="IGNT">Interlinear Greek New Testament (IGNT)</option>
-<option value="ISV">International Standard Version (ISV)</option>
-<option value="Icelandic">Icelandic Bible (Icelandic)</option>
-<option value="IndBIS">Indonesian Bahasa Indonesia Sehari-hari (IndBIS)</option>
-<option value="IndTB">Indonesian Terjemahan Baru (IndTB)</option>
-<option value="IndTL">Indonesian Terjemahan Baru (IndTL)</option>
-<option value="ItaIEP">Italian NVB Nuovissima Versione della Bibbbia San Paolo Edizione (ItaIEP)</option>
-<option value="ItaLND">Italian 1991 La Nuova Diodati (ItaLND)</option>
-<option value="ItaNRV">Italian 1994 La Sacra Bibbia Nuova Riveduta (ItaNRV)</option>
-<option value="JPS">Jewish Publication Society Old Testament (JPS)</option>
-<option value="JST">Joseph Smith Translation (JST)</option>
-<option value="JapKUG">Japanese JKUG Translation (JapKUG)</option>
-<option value="JapSNKI">Japanese JSNKI Translation (JapSNKI)</option>
-<option value="KJ21">21st Century King James Version (KJ21)</option>
-<option value="KJV">King James Version of 1611 w/ Strongs Numbers (KJV)</option>
-<option value="Ketchi">Ketchi Bible (Ketchi)</option>
-<option value="Korean">Korean Bible (Korean)</option>
-<option value="LITV">Green's Literal Translation (LITV)</option>
-<option value="LO">The Living Oracles NT (LO)</option>
-<option value="LXX">Septuagint (LXX)</option>
-<option value="LXXM">Septuagint, Morphologically Tagged Rahlfs' (LXXM)</option>
-<option value="Latvian">Latvian New Testament (Latvian)</option>
-<option value="MKJV">Green's Modern King James Version (MKJV) (MKJV)</option>
-<option value="ManxGaelic">Manx Gaelic Scripture Portions (ManxGaelic)</option>
-<option value="Maori">Maori Bible (Maori)</option>
-<option value="Mel">Melanesian Pidgin Bible (Mel)</option>
-<option value="Montgomery">Montgomery New Testament (Montgomery)</option>
-<option value="Murdock">James Murdock's Translation of the Syriac Peshitta (Murdock)</option>
-<option value="N27U4">Nestle Aland 27th Ed./ UBS 4th Ed. Greek Text (N27U4)</option>
-<option value="NAB">New American Bible (NAB)</option>
-<option value="NASB">The New American Standard Bible (NASB)</option>
-<option value="NASB95">The New American Standard Bible 1995 Update (NASB95)</option>
-<option value="NCV">New Century Version (NCV)</option>
-<option value="NIV">New International Version (NIV)</option>
-<option value="NIVBr">New International Version, British Edition (NIVBr)</option>
-<option value="NJB">New Jerusalem Bible (NJB)</option>
-<option value="NKJV">New King James Version (NKJV)</option>
-<option value="NLT">New Living Translation (NLT)</option>
-<option value="NRSV">New Revised Standard Version (NRSV)</option>
-<option value="NorBok">Norwegian 1930 Bokmal (NorBok)</option>
-<option value="NorN38">Norwegian 1938 Nynorsk (NorN38)</option>
-<option value="NorNBK">Norwegian Bibel Konkordant (NorNBK)</option>
-<option value="NorNyn">Norwegian 1994 Nynorsk (NorNyn)</option>
-<option value="Norsk">Norsk Bibelen (Norsk)</option>
-<option value="ORTHJBC">The Orthodox Jewish Brit Chadasha (ORTHJBC)</option>
-<option value="PhiCEB">Philippine Nga Cebuano (PhiCEB)</option>
-<option value="Phillips">J B Phillips New Testament (Phillips)</option>
-<option value="PolBTP">Polish Millenium Bible 1984, 4th Ed. (PolBTP)</option>
-<option value="PorAA">Portuguese Joao Ferreira de Almeida Atualizada (PorAA)</option>
-<option value="PorACF">Brazillian Portuguese Joao Ferreira de Almeida, Corrigada Fiel 1995 (PorACF)</option>
-<option value="PorBRP">Portuguese 1994 Almeida Biblia (PorBRP)</option>
-<option value="PorRA">Portuguese Almeida Revista e Atualizada (PorRA)</option>
-<option value="PorRC">Portuguese Almeida Revista e Corrigida (PorRC)</option>
-<option value="RNKJV">Restored Name King James Version (RNKJV)</option>
-<option value="RST">Russian Synodal Translation (RST)</option>
-<option value="RSV">Revised Standard Version (RSV)</option>
-<option value="RVIC">Revised Version, Improved and Corrected (RVIC)</option>
-<option value="RWebster">Revised 1833 Webster Version (RWebster)</option>
-<option value="RomCor">Romanian Cornilescu Version (RomCor)</option>
-<option value="Romani">Romani (Gypsy) New Testament (Romani)</option>
-<option value="Rotherham">The Emphasized Bible by J. B. Rotherham (Rotherham)</option>
-<option value="Sango">Le Sainte Bible en sango, 1996 (Sango)</option>
-<option value="ScotsGaelic">Scots Gaelic Gospel of Mark (ScotsGaelic)</option>
-<option value="Scrivner">1894 Scrivener Textus Receptus (Scrivner)</option>
-<option value="SpaLBA">Spanish La Biblia de Las Americas (SpaLBA)</option>
-<option value="SpaRV">Spanish Reina-Valera (SpaRV)</option>
-<option value="SpaRV60">Spanish Reina-Valera Revised 1960 (SpaRV60)</option>
-<option value="SpaRV95">Spanish Reina-Valera Update 1995 (SpaRV95)</option>
-<option value="SpaRVA">Spanish Version Reina-Valera Actualizada (SpaRVA)</option>
-<option value="SpaSEV">Spanish 1569 Sagradas Escrituras Version Antigua (SpaSEV)</option>
-<option value="SpaVNT">Spanish 1858 Valera New Testament (SpaVNT)</option>
-<option value="Stephanus">1550 Stephanus Textus Receptus (Stephanus)</option>
-<option value="Swahili">Swahili New Testament (Swahili)</option>
-<option value="SweSVE">Swedish Bible 1917 New Testament (SweSVE)</option>
-<option value="TEV">Todays English Version (Good News Bible) 1966 and 1976 (TEV)</option>
-<option value="TMB">Third Millenium Bible (TMB)</option>
-<option value="Tagalog">Tagalog (John & James) (Tagalog)</option>
-<option value="Tamil">Tamil Bible (Tamil)</option>
-<option value="ThaiKJV">Thai KJV (ThaiKJV)</option>
-<option value="Tisch">Tischendorf's Eighth Edition GNT (Tisch)</option>
-<option value="Turkish">Turkish NT (Turkish)</option>
-<option value="Twenty">Twentieth Century New Testament (Twenty)</option>
-<option value="UMGreek">Unaccented Modern Greek Text (UMGreek)</option>
-<option value="Ukrainian">Ukrainian Bible (Ukrainian)</option>
-<option value="Uma">Uma New Testament (Uma)</option>
-<option value="Viet">1934 Vietnamese Bible (Viet)</option>
-<option value="Vulgate">Latin Vulgate (Vulgate)</option>
-<option value="Vulgate_HebPs">Latin Vulgate Psalms from Hebrew (Vulgate_HebPs)</option>
-<option value="WEB">World English Bible (WEB)</option>
-<option value="WH">1881 Westcott-Hort Greek Text (WH)</option>
-<option value="WHNU">Westcott-Hort with NA27U4 variants (WHNU)</option>
-<option value="Websters">Webster Bible (Websters)</option>
-<option value="Weymouth">1912 Weymouth NT (Weymouth)</option>
-<option value="Xhosa">Xhosa Bible (Xhosa)</option>
-<option value="YLT">1898 Young's Literal Translation (YLT)</option>
-</select><input type="submit" name="Submit" value="Submit"></form><br/><form method="get" action="cgi-bin/dia-def.pl">Select locale:&nbsp;
-<select name="locale" size="1"><option value="">browser default</option>
-<option value="en">en</option>
-<option value="de">de</option>
-<option value="pt">pt</option>
-<option value="sk">sk</option>
-<option value="cs">cs</option>
-<option value="da">da</option>
-<option value="no">no</option>
-</select>
-<input type="submit" name="Submit" value="Submit">
-</form>
-Many of these modules require a browser with good Unicode support such as Internet 
-Explorer 5.0+ and a good Unicode font such as Code 2000 (available at <a href="http://home.att.net/~jameskass/">http://home.att.net/~jameskass/</a>). 
-</body>
-</html>
diff --git a/utilities/diatheke/cgi/index-public.html b/utilities/diatheke/cgi/index.html
index 8406364..8406364 100644
--- a/utilities/diatheke/cgi/index-public.html
+++ b/utilities/diatheke/cgi/index.html
diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp
index f2dcac9..9b4a8f1 100644
--- a/utilities/diatheke/corediatheke.cpp
+++ b/utilities/diatheke/corediatheke.cpp
@@ -250,6 +250,10 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
                 manager.setGlobalOption("Transliteration", script);
 	else
 		manager.setGlobalOption("Transliteration", "Off");
+	if (optionfilters & OP_ARABICPOINTS)
+		manager.setGlobalOption("Arabic Vowel Points","On");
+	else
+		manager.setGlobalOption("Arabic Vowel Points","Off");
 
 	if (querytype == QT_SEARCH) {
 
diff --git a/utilities/diatheke/diatheke.cpp b/utilities/diatheke/diatheke.cpp
index 3ffe194..30add7b 100644
--- a/utilities/diatheke/diatheke.cpp
+++ b/utilities/diatheke/diatheke.cpp
@@ -1,5 +1,5 @@
-// Diatheke 4.2.1 by Chris Little <chrislit@crosswire.org>
-// Copyright 1999-2005 by CrossWire Bible Society
+// Diatheke 4.5 by Chris Little <chrislit@crosswire.org>
+// Copyright 1999-2009 by CrossWire Bible Society
 // http://www.crosswire.org/sword/diatheke
 
 /*
@@ -31,8 +31,8 @@ using std::cout;
 
 void printsyntax() { 
 	//if we got this far without exiting, something went wrong, so print syntax
-	fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.2.1\n");
-	fprintf (stderr, "Copyright 1999-2005 by the CrossWire Bible Society\n");
+	fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.5\n");
+	fprintf (stderr, "Copyright 1999-2009 by the CrossWire Bible Society\n");
 	fprintf (stderr, "http://www.crosswire.org/sword/diatheke/\n");
 	fprintf (stderr, "usage: \n  ");
  	fprintf (stderr, "diatheke <-b module_name> [-s search_type] [-r search_range]\n");
@@ -47,7 +47,7 @@ void printsyntax() {
 	fprintf (stderr, "Valid option_filters values are: n (Strong's numbers),\n");
 	fprintf (stderr, "  f (Footnotes), m (Morphology), h (Section Headings),\n");
 	fprintf (stderr, "  c (Cantillation), v (Hebrew Vowels), a (Greek Accents), p (Arabic Vowels)\n");
-	fprintf (stderr, "  l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping,\n");
+	fprintf (stderr, "  l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping),\n");
 	fprintf (stderr, "  b (Bi-Directional Reordering), x (Red Words of Christ)\n");
 
 	fprintf (stderr, "Maximum verses may be any integer value\n");
@@ -162,6 +162,10 @@ int main(int argc, char **argv)
 					outputformat = FMT_GBF;
 					i++;
 				}
+				else if (!::stricmp("htmlhref", argv[i+1])) {
+					outputformat = FMT_HTMLHREF;
+					i++;
+				}
 				else if (!::stricmp("html", argv[i+1])) {
 					outputformat = FMT_HTML;
 					i++;
diff --git a/utilities/diatheke/tcl/README b/utilities/diatheke/tcl/README
new file mode 100644
index 0000000..4614422
--- /dev/null
+++ b/utilities/diatheke/tcl/README
@@ -0,0 +1,53 @@
+Diatheke/Tcl by Chris Little <chrislit@crosswire.org>

+Based on code schema of <cking@acy.digex.net>

+

+#######################################################################

+Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)

+	CrossWire Bible Society

+	P. O. Box 2528

+	Tempe, AZ  85280-2528

+

+This program is free software; you can redistribute it and/or modify it

+under the terms of the GNU General Public License as published by the

+Free Software Foundation version 2.

+

+This program is distributed in the hope that it will be useful, but

+WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+General Public License for more details.

+

+#######################################################################

+

+This script is intended for use with libraries and modules from

+The SWORD Project, available at http://www.crosswire.org/

+

+This script requires the Diatheke command line front end to The SWORD

+Project. You should really install this first, including all optional

+components: zlib, CLucene, ICU (preferrably icu-sword), and cURL. Then

+install any modules you want to make available to users.

+

+Modify the file biblebot-diatheke.tcl as necessary so that the two

+variables "diatheke" and "dict" point to the copies of the diatheke

+and dict programs on your system.

+

+Finally, run the Perl script makebooklist.pl, which will

+create/overwrite the file biblebot-diatheke-books.tcl. This includes

+all books installed on the system, so remove any entries you want to

+hide from users, as necessary.

+

+To install Diatheke/Tcl, install an eggdrop IRC bot, copy the

+Diatheke/Tcl .tcl files (biblebot-diatheke.tcl and 

+biblebot-diatheke-books.tcl) to your eggdrop scripts directory, and

+add a line to the end of your bot startup script to load the two

+Diatheke/Tcl scripts, for example:

+ 

+source /usr/share/eggdrop/scripts/biblebot-diatheke.tcl

+source /usr/share/eggdrop/scripts/biblebot-diatheke-books.tcl

+

+This script has been tested with eggdrop 1.3.23 & 1.6.19, but should

+function fine in later versions.

+

+When you get the script loaded, type !biblehelp in a channel where

+the bot is present and it will give you a full list of commands.

+More commands will appear to you depending upon which mode the bot is

+in and whether you are an op on the bot or voiced in the channel.

diff --git a/utilities/diatheke/tcl/biblebot-diatheke-books.tcl b/utilities/diatheke/tcl/biblebot-diatheke-books.tcl
new file mode 100644
index 0000000..f10528b
--- /dev/null
+++ b/utilities/diatheke/tcl/biblebot-diatheke-books.tcl
@@ -0,0 +1,42 @@
+# Diatheke/Tcl 5.0 by Chris Little <chrislit@crosswire.org>
+
+# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+bind pub - !KJV setver_KJV
+
+proc setver_KJV {nick uhost hand channel arg} {
+    global botnick chan bibver
+    set bibver KJV
+    pub_lookup $nick $uhost $hand $channel $arg
+}
+
+bind pub - !sKJV setver_sKJV
+
+proc setver_sKJV {nick uhost hand channel arg} {
+    global botnick chan bibver
+    set bibver KJV
+    pub_lookups $nick $uhost $hand $channel $arg
+}
+
+proc printBibles {nick} {
+	putserv "NOTICE $nick :Bibles (1):"
+	putserv "NOTICE $nick :King James Version (1769) with Strongs Numbers and Morphology (!KJV)"
+}
+
+proc printComms {nick} {
+}
+
+proc printDicts {nick} {
+}
diff --git a/utilities/diatheke/tcl/biblebot-diatheke.tcl b/utilities/diatheke/tcl/biblebot-diatheke.tcl
index 52d7568..6fb196f 100644
--- a/utilities/diatheke/tcl/biblebot-diatheke.tcl
+++ b/utilities/diatheke/tcl/biblebot-diatheke.tcl
@@ -1,53 +1,26 @@
-# Diatheke/Tcl 3.0 by Chris Little <chrislit@gotjesus.org>
+# Diatheke/Tcl 5.0 by Chris Little <chrislit@crosswire.org>
 # Based on code schema of <cking@acy.digex.net>
 
-# *
-# * Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)
-# *	CrossWire Bible Society
-# *	P. O. Box 2528
-# *	Tempe, AZ  85280-2528
-# *
-# * This program is free software; you can redistribute it and/or modify it
-# * under the terms of the GNU General Public License as published by the
-# * Free Software Foundation version 2.
-# *
-# * This program is distributed in the hope that it will be useful, but
-# * WITHOUT ANY WARRANTY; without even the implied warranty of
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# * General Public License for more details.
-# *
-
-
-# This script is intended for use with libraries and modules from
-# the SWORD Project, available at http://www.crosswire.org/
-#
-# To install Diatheke/Tcl, install an eggdrop IRC bot, copy the
-# Diatheke/Tcl .tcl file to your eggdrop scripts directory, and
-# add a line to the end of your bot startup script to load the
-# Diatheke/Tcl script.  This script has been tested with eggdrop 1.3.23
-# but should function fine in later versions.
+# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)
+# 	CrossWire Bible Society
+# 	P. O. Box 2528
+# 	Tempe, AZ  85280-2528
 #
-# This is script assumes you have every single SWORD module installed
-# that was available at the time of release.  Since you probably do not,
-# remove all modules listed in the pub_books function that you do not
-# have installed to hide them from end-users.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
 #
-# The !history command only works if you have LOGGING turned on in
-# diatheke (the command line C program).  This command is commented out
-# of the help function and must be uncommented to make it show up for
-# end-users.
-#
-# When you get the script loaded, type !biblehelp in a channel where
-# the bot is present and it will give you a full list of commands.
-# More commands will appear to you depending upon which mode the bot is
-# in and whether you are an op on the bot or voiced in the channel.
-
-set diaver 4.0
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+# GNU General Public License for more details.
 
-#modify this to reflect actual location of diatheke and dict binaries
+# modify this to reflect actual location of diatheke and dict binaries
 set diatheke "/usr/bin/diatheke"
 set dict "/usr/bin/dict"
 
+set diaver 5.0
+
 proc publookupverse {vlookup} {
     global botnick chan bibver diatheke
 
@@ -65,6 +38,7 @@ proc publookupverse {vlookup} {
     set vlookup [string trimleft $vlookup "@"]
     set vlookup [string trimleft $vlookup "#"]
 
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $vlookup { } vlookup
     catch {exec $diatheke -f plaintext -o $arg -b $bibver -k "$vlookup" >& /tmp/fooout.$botnick}
     catch {set foofile [open /tmp/fooout.$botnick]}
     while {[gets $foofile fooverse] >= 0} {
@@ -95,12 +69,11 @@ proc publookupverse {vlookup} {
 	putmsg $chan "$foo2"
     }
     
-    catch {close $foofile}    
+    catch {close $foofile}
     exec rm /tmp/fooout.$botnick
     return 1
 }
 
-
 proc pub_lookup {nick uhost hand channel arg} {
     global von chan bibver
     set chan $channel
@@ -112,761 +85,15 @@ proc pub_lookup {nick uhost hand channel arg} {
 	putmsg $nick "Only ops can display verses at this time."
 	return 0
     }
-	
-    publookupverse $arg
-
-}
-
-bind pub - !kjv setver_kjv
-bind pub - !english setver_kjv
-
-proc setver_kjv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver KJV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-
-bind pub - !niv setver_niv
-
-proc setver_niv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NIV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !dr setver_dr
-bind pub - !douayrheims setver_dr
-bind pub - !dre setver_dr
-
-proc setver_dr {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DR
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !nas setver_nasb
-bind pub - !nasb setver_nasb
-
-proc setver_nasb {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NASB
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !hnv setver_hnv
-
-proc setver_hnv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver HNV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !web setver_web
-
-proc setver_web {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WEB
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !akjv setver_akjv
-
-proc setver_akjv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver AKJV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !bbe setver_bbe
-
-proc setver_bbe {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver BBE
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !webster setver_webster
-
-proc setver_webster {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Websters
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !jbc setver_jbc
-
-proc setver_jbc {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ORTHJBC
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !rva setver_rva
-bind pub - !spanish setver_rva
-
-proc setver_rva {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaRVA
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lsg setver_lsg
-bind pub - !french setver_lsg
-
-proc setver_lsg {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreLSG
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !bis setver_bis
-bind pub - !indonesian setver_bis
-
-proc setver_bis {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver IndBIS
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !tb setver_tb
-
-proc setver_tb {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver IndTB
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sve setver_sve
-bind pub - !swedish setver_sve
-
-proc setver_sve {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SweSve
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !vnt setver_vnt
-
-proc setver_vnt {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaVNT
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !asv setver_asv
-
-proc setver_asv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ASV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !rsv setver_rsv
-
-proc setver_rsv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RSV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !alt setver_alt
-
-proc setver_alt {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ALT
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !dby setver_dby
-bind pub - !darby setver_dby
-
-proc setver_dby {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Darby
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !pr setver_pr
-bind pub - !finnish setver_pr
-
-proc setver_pr {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FinPR
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lsg setver_lsg
-bind pub - !french setver_lsg
-
-proc setver_lsg {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreLSG
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lut setver_lut
-bind pub - !luther setver_lut
-bind pub - !german setver_lut
-
-proc setver_lut {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver GerLut
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sch setver_sch
-
-proc setver_sch {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver GerSch
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-
-bind pub - !kar setver_kar
-bind pub - !hungarian setver_kar
-
-proc setver_kar {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver HunKar
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !nrv setver_nrv
-bind pub - !italian setver_nrv
-
-proc setver_nrv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ItaNRV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !jps setver_jps
-
-proc setver_jps {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver JPS
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !brp setver_brp
-bind pub - !portuguese setver_brp
-
-proc setver_brp {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver PorBRP
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sev setver_sev
-
-proc setver_sev {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaSEV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !swahili setver_swahili
-
-proc setver_swahili {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Swahili
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !wey setver_wey
-bind pub - !weymouth setver_wey
-
-proc setver_wey {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Weymouth
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !ylt setver_ylt
-
-proc setver_ylt {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver YLT
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !alb setver_alb
-bind pub - !albanian setver_alb
-
-proc setver_alb {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Alb
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !gnpu setver_gnpu
-bind pub - !chinese setver_gnpu
-
-proc setver_gnpu {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ChiGNPU
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !dan setver_dan
-bind pub - !danish setver_dan
-
-proc setver_dan {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Dan
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lei setver_lei
-bind pub - !dutch setver_lei
-
-proc setver_lei {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DutLEI
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lu setver_lu
-
-proc setver_lu {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DutLU
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !svv setver_svv
-
-proc setver_svv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DutSVV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !shr setver_shr
-bind pub - !equadoran setver_shr
-
-proc setver_shr {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver EquShr
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !crl setver_crl
-bind pub - !creole setver_crl
-
-proc setver_crl {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreCrl
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !fredrb setver_fredrb
-
-proc setver_fredrb {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreDrb
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !ben setver_ben
-
-proc setver_ben {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver GerBen
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !elb setver_elb
-
-proc setver_elb {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver GerElb
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !kj21 setver_kj21
-
-proc setver_kj21 {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver KJ21
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !litv setver_litv
-
-proc setver_litv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver LITV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lo setver_lo
-
-proc setver_lo {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver LO
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !maori setver_maori
-
-proc setver_maori {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Maori
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !mkjv setver_mkjv
-
-proc setver_mkjv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver MKJV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !nkj setver_nkjv
-bind pub - !nkjv setver_nkjv
-
-proc setver_nkjv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NKJV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !ceb setver_ceb
-bind pub - !filipino setver_ceb
-
-proc setver_ceb {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver PhiCeb
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !rwebster setver_rwebster
-
-proc setver_rwebster {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RWebster
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !rv setver_rv
-
-proc setver_rv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaRV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !turkish setver_turkish
-
-proc setver_turkish {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Turkish
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !uma setver_uma
-
-proc setver_uma {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Uma
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !vulgate setver_vulgate
-bind pub - !vulg setver_vulgate
-bind pub - !latin setver_vulgate
-
-proc setver_vulgate {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Vulgate
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !nasb95 setver_nasb95
-bind pub - !nas95 setver_nasb95
-bind pub - !nau setver_nasb95
-
-proc setver_nasb95 {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NASB95
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !nivbr setver_nivbr
-bind pub - !nib setver_nivbr
-
-proc setver_nivbr {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NIVBr
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !nlt setver_nlt
-
-proc setver_nlt {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NLT
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !nrsv setver_nrsv
-
-proc setver_nrsv {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NRSV
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !neg setver_neg
-
-proc setver_neg {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreNEG
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lnd setver_lnd
-
-proc setver_lnd {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ItaLND
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !mel setver_mel
-bind pub - !melanesian setver_mel
-
-proc setver_mel {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Mel
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !norsk setver_norsk
-
-proc setver_norsk {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Norsk
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !cor setver_cor
-
-proc setver_cor {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RomCor
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lba setver_lba
-
-proc setver_lba {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaLBA
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !byz setver_byz
-
-proc setver_byz {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ByzX
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !lxx setver_lxx
-
-proc setver_lxx {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver LXXX
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !na26 setver_na26
-bind pub - !greek setver_na26
-
-proc setver_na26 {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NA26X
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !scrivner setver_scrivner
-
-proc setver_scrivner {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ScrivnerX
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !stephanus setver_stephanus
-
-proc setver_stephanus {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver StephanusX
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !tischendorf setver_tisch
-bind pub - !tisch setver_tisch
-
-proc setver_tisch {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver TischX
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !wh setver_wh
-
-proc setver_wh {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WHX
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !whnu setver_whnu
-
-proc setver_whnu {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WHNUX
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !grkbyz setver_grkbyz
-
-proc setver_grkbyz {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Byz
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !grklxx setver_grklxx
-
-proc setver_grklxx {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver LXX
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !grkna26 setver_grkna26
-bind pub - !grkgreek setver_na26
 
-proc setver_grkna26 {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NA26
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !grkscrivner setver_grkscrivner
-
-proc setver_grkscrivner {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Scrivner
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !grkstephanus setver_grkstephanus
-
-proc setver_grkstephanus {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Stephanus
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !grktischendorf setver_grktisch
-bind pub - !grktisch setver_grktisch
-
-proc setver_grktisch {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Tisch
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !grkwh setver_grkwh
-
-proc setver_grkwh {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WH
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !grkwhnu setver_grkwhnu
-
-proc setver_grkwhnu {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WHNU
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !bhs setver_bhs
-bind pub - !hebrew setver_bhs
-
-proc setver_bhs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver BHS
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !rst setver_rst
-
-proc setver_rst {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RST
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !ukrainian setver_ukrainian
-
-proc setver_ukrainian {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Ukrainian
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !arabic setver_arabic
-
-proc setver_arabic {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Arabic
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !n27u4 setver_n27u4
-bind pub - !nu setver_n27u4
-bind pub - !bgreek setver_n27u4
-
-proc setver_n27u4 {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver N27U4
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !umgreek setver_ukgreek
-
-proc setver_umgreek {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver UMGreek
-    pub_lookup $nick $uhost $hand $channel $arg
-}
-
-bind pub - !viet setver_viet
-bind pub - !vietnamese setver_viet
-
-proc setver_viet {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Viet
-    pub_lookup $nick $uhost $hand $channel $arg
+    publookupverse $arg
 }
 
-
-# ----------------------------------------------------------------------
+#----------------------------------------------------------------------
 
 proc pubsearchword {vlookup} {
     global botnick chan bibver diatheke
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $vlookup { } vlookup
     catch {exec $diatheke -s $bibver "$vlookup" >& /tmp/fooout.$botnick}
     catch {set foofile [open /tmp/fooout.$botnick]}
 
@@ -894,7 +121,6 @@ proc pubsearchword {vlookup} {
     return 1
 }
 
-
 proc pub_lookups {nick uhost hand channel arg} {
     global von chan bibver
     set chan $channel
@@ -914,738 +140,11 @@ proc pub_lookups {nick uhost hand channel arg} {
     pubsearchword $arg
 }
 
-bind pub - !skjv setver_kjvs
-bind pub - !senglish setver_kjvs
-
-proc setver_kjvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver KJV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-
-bind pub - !sniv setver_nivs
-
-proc setver_nivs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NIV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sdr setver_drs
-bind pub - !sdouayrheims setver_drs
-bind pub - !sdre setver_drs
-
-proc setver_drs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DR
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !snas setver_nasbs
-bind pub - !snasb setver_nasbs
-
-proc setver_nasbs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NASB
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !shnv setver_hnvs
-
-proc setver_hnvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver HNV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sweb setver_webs
-
-proc setver_webs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WEB
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sbbe setver_bbes
-
-proc setver_bbes {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver BBE
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !swebster setver_websters
-
-proc setver_websters {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Websters
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sjbc setver_jbcs
-
-proc setver_jbcs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ORTHJBC
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !srva setver_rvas
-bind pub - !sspanish setver_rvas
-
-proc setver_rvas {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaRVA
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sbis setver_biss
-bind pub - !sindonesian setver_biss
-
-proc setver_biss {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver IndBIS
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !stb setver_tbs
-
-proc setver_tbs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver IndTB
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !ssve setver_sves
-bind pub - !sswedish setver_sves
-
-proc setver_sves {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SweSve
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !svnt setver_vnts
-
-proc setver_vnts {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaVNT
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sasv setver_asvs
-
-proc setver_asvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ASV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !srsv setver_rsvs
-
-proc setver_rsvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RSV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !salt setver_alts
-
-proc setver_alts {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ALT
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sdby setver_dbys
-bind pub - !sdarby setver_dbys
-
-proc setver_dbys {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Darby
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !spr setver_prs
-bind pub - !sfinnish setver_prs
-
-proc setver_prs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FinPR
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slsg setver_lsgs
-bind pub - !sfrench setver_lsgs
-
-proc setver_lsgs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreLSG
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slut setver_luts
-bind pub - !sluther setver_luts
-bind pub - !sgerman setver_luts
-
-proc setver_luts {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver GerLut
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !ssch setver_schs
-
-proc setver_schs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver GerSch
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-
-bind pub - !skar setver_kars
-bind pub - !shungarian setver_kars
-
-proc setver_kars {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver HunKar
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !snrv setver_nrvs
-bind pub - !sitalian setver_nrvs
-
-proc setver_nrvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ItaNRV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sjps setver_jpss
-
-proc setver_jpss {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver JPS
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sbrp setver_brps
-bind pub - !sportuguese setver_brps
-
-proc setver_brps {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver PorBRP
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !ssev setver_sevs
-
-proc setver_sevs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaSEV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sswahili setver_swahilis
-
-proc setver_swahilis {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Swahili
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !swey setver_weys
-bind pub - !sweymouth setver_weys
-
-proc setver_weys {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Weymouth
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sylt setver_ylts
-
-proc setver_ylts {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver YLT
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !salb setver_albs
-bind pub - !salbanian setver_albs
-
-proc setver_albs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ALB
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgnpu setver_gnpus
-bind pub - !schinese setver_gnpus
-
-proc setver_gnpus {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ChiGNPU
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sdan setver_dans
-bind pub - !sdanish setver_dans
-
-proc setver_dans {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Dan
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slei setver_leis
-bind pub - !sdutch setver_leis
-
-proc setver_leis {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DutLEI
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slu setver_lus
-
-proc setver_lus {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DutLU
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !ssvv setver_svvs
-
-proc setver_svvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DutSVV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sshr setver_shrs
-bind pub - !sequadoran setver_shrs
-
-proc setver_shrs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver EquShr
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !scrl setver_crls
-bind pub - !screole setver_crls
-
-proc setver_crls {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreCrl
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sfredrb setver_fredrbs
-
-proc setver_fredrbs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreDrb
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sben setver_bens
-
-proc setver_bens {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver BerBen
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !selb setver_elbs
-
-proc setver_elbs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver GerElb
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !skj21 setver_kj21s
-
-proc setver_kj21s {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver KJ21
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slitv setver_litvs
-
-proc setver_litvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver LITV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slo setver_los
-
-proc setver_los {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver LO
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !smaori setver_maoris
-
-proc setver_maoris {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Mao
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !smkjv setver_mkjvs
-
-proc setver_mkjvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver MKJV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !snkjv setver_nkjvs
-
-proc setver_nkjvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NKJV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sceb setver_cebs
-bind pub - !sfilipino setver_cebs
-
-proc setver_cebs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver PhiCeb
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !srwebster setver_rwebsters
-
-proc setver_rwebsters {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RWebster
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !srv setver_rvs
-
-proc setver_rvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaRV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sturkish setver_turkishs
-
-proc setver_turkishs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Turkish
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !suma setver_umas
-
-proc setver_umas {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Uma
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !svulgate setver_vulgates
-bind pub - !svulg setver_vulgates
-bind pub - !slatin setver_vulgates
-
-proc setver_vulgates {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Vulgate
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !snasb95 setver_nasb95s
-bind pub - !snas95 setver_nasb95s
-bind pub - !snau setver_nasb95s
-
-proc setver_nasb95s {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NASB95
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !snivbr setver_nivbrs
-bind pub - !snib setver_nivbrs
-
-proc setver_nivbrs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NIVBr
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !snlt setver_nlts
-
-proc setver_nlts {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NLT
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !snrsv setver_nrsvs
-
-proc setver_nrsvs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NRSV
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sneg setver_negs
-
-proc setver_negs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver FreNEG
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slnd setver_lnds
-
-proc setver_lnds {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ItaLND
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !smel setver_mels
-bind pub - !smelanesian setver_mels
-
-proc setver_mels {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Mel
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !snorsk setver_norsks
-
-proc setver_norsks {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Norsk
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !scor setver_cors
-
-proc setver_cors {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RomCor
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slba setver_lbas
-
-proc setver_lbas {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver SpaLBA
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sbyz setver_byzs
-
-proc setver_byzs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ByzX
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !slxx setver_lxxs
-
-proc setver_lxxs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver LXXX
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sna26 setver_na26s
-bind pub - !sgreek setver_na26s
-
-proc setver_na26s {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NA26X
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sscrivner setver_scrivners
-
-proc setver_scrivners {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ScrivnerX
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sstephanus setver_stephanuss
-
-proc setver_stephanuss {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver StephanusX
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !stischendorf setver_tischs
-bind pub - !stisch setver_tischs
-
-proc setver_tischs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver TischX
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !swh setver_whs
-
-proc setver_whs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WHX
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !swhnu setver_whnus
-
-proc setver_whnus {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WHNUX
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgrkbyz setver_grkbyzs
-
-proc setver_grkbyzs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Byz
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgrklxx setver_grklxxs
-
-proc setver_grklxxs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver LXX
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgrkna26 setver_grkna26s
-bind pub - !sgrkgreek setver_na26s
-
-proc setver_grkna26s {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver NA26
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgrkscrivner setver_grkscrivners
-
-proc setver_grkscrivners {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Scrivner
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgrkstephanus setver_grkstephanuss
-
-proc setver_grkstephanuss {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Stephanus
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgrktischendorf setver_grktischs
-bind pub - !sgrktisch setver_grktischs
-
-proc setver_grktischs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Tisch
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgrkwh setver_grkwhs
-
-proc setver_grkwhs {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WH
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sgrkwhnu setver_grkwhnus
-
-proc setver_grkwhnus {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver WHNU
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sbhs setver_bhss
-bind pub - !shebrew setver_bhss
-
-proc setver_bhss {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver BHS
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !srst setver_rsts
-
-proc setver_rsts {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RST
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sukrainian setver_ukrainians
-
-proc setver_ukrainians {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Ukrainian
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sarabic setver_arabics
-
-proc setver_arabics {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Arabic
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sn27u4 setver_n27u4s
-bind pub - !snu setver_n27u4s
-bind pub - !sbgreek setver_n27u4s
-
-proc setver_n27u4s {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver N27U4
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sumgreek setver_ukgreeks
-
-proc setver_umgreeks {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver UMGreek
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
-bind pub - !sviet setver_viets
-bind pub - !svietnamese setver_viets
-
-proc setver_viets {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Viet
-    pub_lookups $nick $uhost $hand $channel $arg
-}
-
 #----------------------------------------------------------------------
 
-
 proc publookupdict {vlookup} {
     global botnick chan bibver diatheke
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $vlookup { } vlookup
     catch {exec $diatheke -f plaintext -b $bibver -k "$vlookup" >& /tmp/fooout.$botnick}
     catch {set foofile [open /tmp/fooout.$botnick]}
 
@@ -1653,11 +152,10 @@ proc publookupdict {vlookup} {
 	putmsg $chan "$fooverse"
     }
     catch {close $foofile}
-  #  exec rm /tmp/fooout.$botnick
+    exec rm /tmp/fooout.$botnick
     return 1
 }
 
-
 proc pub_lookupd {nick uhost hand channel arg} {
     global von chan bibver
     set chan $channel
@@ -1673,111 +171,27 @@ proc pub_lookupd {nick uhost hand channel arg} {
 	putmsg $nick "Sorry, only ops can use dictionaries and indices right now."
 	return 0
     }
-    
-    publookupdict $arg
-}
-
-bind pub - !losung setver_losung
-
-proc setver_losung {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver losung_en_99
-    set arg [exec date "+%m.%d"]
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !vines setver_vines
-
-proc setver_vines {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Vines
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !naves setver_naves
-
-proc setver_naves {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Naves
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !eastons setver_eastons
-
-proc setver_eastons {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Eastons
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !strheb setver_strheb
-
-proc setver_strheb {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver StrongsHebrew
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !strgrk setver_strgrk
-
-proc setver_strgrk {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver StrongsGreek
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !bdb setver_bdb
-
-proc setver_bdb {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver BDB
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !thayer setver_thayer
-
-proc setver_thayer {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Thayer
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !hitch setver_hitch
-
-proc setver_hitch {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Hitch
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !isbe setver_isbe
-
-proc setver_isbe {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver ISBE
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
-
-bind pub - !smiths setver_smiths
 
-proc setver_smiths {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Smiths
-    pub_lookupd $nick $uhost $hand $channel $arg
+    publookupdict $arg
 }
 
-bind pub - !torrey setver_torrey
+# Saving this as an example of some interesting (but now lost) functionality
+# whereby the argument is overridden by the current date for a daily
+# devotional query.
 
-proc setver_torrey {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Torrey
-    pub_lookupd $nick $uhost $hand $channel $arg
-}
+#bind pub - !losung setver_losung
+#proc setver_losung {nick uhost hand channel arg} {
+#    global botnick chan bibver
+#    set bibver losung_en_99
+#    set arg [exec date "+%m.%d"]
+#    pub_lookupd $nick $uhost $hand $channel $arg
+#}
 
 #----------------------------------------------------------------------
 
 proc publookupcomm {vlookup} {
     global botnick chan bibver diatheke
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $vlookup { } vlookup
     catch {exec $diatheke -c $bibver "$vlookup" >& /tmp/fooout.$botnick}
     catch {set foofile [open /tmp/fooout.$botnick]}
     while {[gets $foofile fooverse] >= 0} {
@@ -1808,7 +222,6 @@ proc publookupcomm {vlookup} {
     return 1
 }
 
-
 proc pub_lookupc {nick uhost hand channel arg} {
     global von chan bibver
     set chan $channel
@@ -1828,86 +241,6 @@ proc pub_lookupc {nick uhost hand channel arg} {
     publookupcomm $arg
 }
 
-bind pub - !rwp setver_rwp
-
-proc setver_rwp {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver RWP
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !mhc setver_mhc
-
-proc setver_mhc {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver MHC
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !dtn setver_dtn
-
-proc setver_dtn {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver DTN
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !family setver_family
-
-proc setver_family {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Family
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !geneva setver_geneva
-
-proc setver_geneva {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Geneva
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !gill setver_gill
-
-proc setver_gill {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Gill
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !pnt setver_pnt
-
-proc setver_pnt {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver PNT
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !tfg setver_tfg
-
-proc setver_tfg {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver TFG
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !tsk setver_tsk
-
-proc setver_tsk {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver TSK
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
-bind pub - !wesley setver_wesley
-
-proc setver_wesley {nick uhost hand channel arg} {
-    global botnick chan bibver
-    set bibver Wesley
-    pub_lookupc $nick $uhost $hand $channel $arg
-}
-
 #----------------------------------------------------------------------
 
 bind pub - !dict dictlookup
@@ -1928,6 +261,7 @@ proc dictlookup {nick uhost hand channel arg} {
 	return 0
     }
     
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $arg { } arg
     catch {exec $dict "$arg" >& /tmp/fooout.$botnick}
     catch {set foofile [open /tmp/fooout.$botnick]}
     catch {set fooverse [gets $foofile]}
@@ -1958,9 +292,6 @@ proc pub_help {nick uhost hand channel arg} {
     putserv "NOTICE $nick :Supported commands:"
     putserv "NOTICE $nick :Help, using \"!biblehelp\""
     putserv "NOTICE $nick :Book list, using \"!books\" (it's long)"
-# Uncomment the next line if you have turned LOGGING on in diatheke to enable
-# the history function.
-#    putserv "NOTICE $nick :See last 5 calls to BibleBot, using \"!history\""
     putserv "NOTICE $nick :Check display status, using \"!status\""
     putserv "NOTICE $nick :Bible lookups, using \"!<bible version> <book> <chapter>:<verse>\""
     putserv "NOTICE $nick :verse ranges can be specified by adding \"-<last verse>\" to this"
@@ -1996,29 +327,14 @@ proc pub_books {nick uhost hand channel arg} {
 	return 1
     }
 
-    putserv "NOTICE $nick :English language Bibles (26):"
-    putserv "NOTICE $nick :Ameican Standard Version (!asv), Analytical Literal Translation (!alt), Bible in Basic English (!bbe), Darby (!dby), Douay-Rheims Bible (!dr), Green's Literal Translation (!litv), Green's Modern King James Version (!mkjv), Hebrew Names Version (!hnv), Jewish Publication Society 1917 (!jps), King James Version (!kjv), The Living Oracles NT (!lo),"
-    putserv "NOTICE $nick :New American Standard Bible (!nasb), New American Standard Bible, 95 Update (!nasb95), New International Version (!niv), New Internation Version, British Edition (!nivbr), New King James Version (!nkjv), New Living Translation (!nlt), New Revised Standard Version (!nrsv), Orthodox Jewish Brit ChadashaNT only (!jbc),"
-    putserv "NOTICE $nick :Revised Standard Version (!rsv), Revised 1833 Webster's (!rwebster), World English Bible (!web), Webster's (!webster), Weymouth NT (!wey), Young's Literal Translation (!ylt), 21st Century King James Version (!kj21)"
-    putserv "NOTICE $nick :Non-English language Bibles (39):"
-    putserv "NOTICE $nick :Albanian Bible (!alb), Chinese GNPU (!gnpu), Danish Bible (!dan), Dutch Leidse Vertaling (!lei), Dutch Lutherse Vertaling (!lu), Dutch Statemvertaling (!svv), Equadoran Shuar NT (!shr), Filipino Nga Cebuano (!ceb),  Finnish Pyhz Raamattu (!pr), French Louis Segond Version (!lsg), French Haitian Creole Version (!crl), French Darby's Version (!fredrb),"
-    putserv "NOTICE $nick :French Nouvelle Edition de Geneve (!neg), German Luther Version (!lut), German Schlachter (!sch), German Bengel NT (!ben), German Elberfelder Version (!elb), Hungarian Karoli (!kar), Indonesian Bahasa Indonesia Sehari-hari (!bis), Indonesian Terjemahan Baru (!tb), Italian La Nouva Diodati (!lnd), Italian La Sacra Bibbia Nuova Riveduta (!nrv),"
-    putserv "NOTICE $nick :Maori Bible (!maori), Melanesian Pidgin Bible (!mel), Norsk Bible (!norsk), Portuguese A Biblia Sagrada Traduzida em Portugues (!brp), Spanish La Biblia de Las Americas (!lba), Spanish Reina-Valera Actualizada (!rva), Spanish Reina-Valera (!rv), Spanish Sagradas Escrituras (!sev), Spanish Valera NT only (!vnt), Swahili NT (!swahili),"
-    putserv "NOTICE $nick :Swedish 1917 Bible NT only (!sve), Turkish NT (!turkish), Uma NT (!uma)"
-    putserv "NOTICE $nick :Original Language Bibles (18): (NB, /'s divide transliterated/non-roman versions)"
-    putserv "NOTICE $nick :1991 Byzantine/Majority Text (!byz/!grkbyz), Nestle-Aland 26th/27th Ed. (!na26/!grkna26), 1894 Scrivner Textus Receptus (!scrivner/!grkscrivner), 1550 Stephanus Textus Receptus (!stephanus/!grkstephanus), Tischendorf' 8th Ed. GNT (!tisch/!grktisch), 1881 Westcott-Hort GNT (!wh/!grkwh), 1881 Westcott-Hort with NA26 alternate readings (!whnu/!grkwhnu)"
-    putserv "NOTICE $nick: Nestle-Aland 27th Ed./UBS 4th Ed. (!n27u4), Septuagint/LXX (!lxx/!grklxx), Biblia Hebraica Stuttgartensia in Hebrew font (!bhs), Jerome's Latin Vulgate (!vulg)"
-    putserv "NOTICE $nick :Non-Roman character Bibles (5):"
-    putserv "NOTICE $nick :Arabic Bible (!arabic), Russian Synodal Translation (!rst), Ukrainian Bible (!ukrainian), Unaccented Modern Greek Bible (!umgreek), Vietnamese Bible (!viet)"
+    printBibles $nick
 
     if {($von==3) && (![matchattr $hand 3]) && (![matchattr $hand o]) && (![isvoice $nick $channel])}  {
 	return 1
     }
 
-    putserv "NOTICE $nick :Dictionaries & Indices (12):"
-    putserv "NOTICE $nick :Webster's Dictionary (!dict), Vine's Bible Dictionary(!vines), Easton's Bible Dictionary (!eastons), Nave's Topical Bible (!naves), Smith's Bible Dictionary (!smiths), Hitchcock's Bible Names Dictionary (!hitch), International Standard Bible Dictionary (!isbe), Torrey's New Topical Textbook (!torrey), Strong's Hebrew Bible Dictionary (!strheb), Strong's Greek Bible Dictionary (!strgrk), Brown-Driver-Briggs Hebrew Lexicon (!bdb), Thayer's Greek Lexicon (!thayer)"
-    putserv "NOTICE $nick :Commentaries (10):"
-    putserv "NOTICE $nick :Darby's Translation Notes (!dtn), Family Bible Notes (!family), Geneva Bible Translation Notes (!geneva), John Gill's Expositor (!gill),  Matthew Henry's Concise (!mhc), The People's New Testament (!pnt), Robertson's Word Pictures (!rwp), The Fourfold Gospel (!tfg), Treasury of Scriptural Knowledge (!tsk), Wesley's Bible Notes (!wesley)"
+    printComms $nick
+    printDicts $nick
 }
 
 #----------------------------------------------------------------------
@@ -2041,25 +357,6 @@ proc pub_status {nick uhost hand channel arg} {
     return 1
 }
 
-
-bind pub - !history pub_hist
-bind msg - history pub_hist
-
-proc pub_hist {nick uhost hand channel arg} {
-    global botnick
-    catch {exec tail -n 5 /var/log/diatheke.log >& /tmp/fooout.$botnick}
-    catch {set foofile [open /tmp/fooout.$botnick]}
-    catch {set fooverse [gets $foofile]}
-    putserv "NOTICE $nick :Last 5 calls to Diatheke/Tcl BibleBot"
-    putserv "NOTICE $nick :$fooverse"
-    while {[gets $foofile fooverse] >= 0} {
-	putserv "NOTICE $nick :$fooverse"
-    }
-    catch {close $foofile}
-    exec rm /tmp/fooout.$botnick
-    return 1
-}
-
 #---------------------------------------------------------------------
 
 proc pub_verseon {nick uhost hand channel arg} {
@@ -2127,18 +424,3 @@ bind dcc - verseon dcc_verseon
 
 #sets default von mode
 set von 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/utilities/diatheke/tcl/makebooklist.pl b/utilities/diatheke/tcl/makebooklist.pl
new file mode 100644
index 0000000..26ef54f
--- /dev/null
+++ b/utilities/diatheke/tcl/makebooklist.pl
@@ -0,0 +1,109 @@
+#!/bin/perl

+

+# Diatheke/Tcl 5.0 by Chris Little <chrislit@crosswire.org>

+

+# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)

+# 	CrossWire Bible Society

+# 	P. O. Box 2528

+# 	Tempe, AZ  85280-2528

+#

+# This program is free software; you can redistribute it and/or modify it

+# under the terms of the GNU General Public License as published by the

+# Free Software Foundation version 2.

+#

+# This program is distributed in the hope that it will be useful, but

+# WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 

+# GNU General Public License for more details.

+

+@booklist = `diatheke -b system -k modulelist`;

+

+open TCL, ">:utf8", "biblebot-diatheke-books.tcl";

+

+print TCL "# Diatheke/Tcl 5.0 by Chris Little <chrislit\@crosswire.org>\n\n# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)\n#	CrossWire Bible Society\n#	P. O. Box 2528\n#	Tempe, AZ  85280-2528\n#\n# This program is free software; you can redistribute it and/or modify it\n# under the terms of the GNU General Public License as published by the\n# Free Software Foundation version 2.\n#\n# This program is distributed in the hope that it will be useful, but\n# WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n\n";

+

+foreach $line (@booklist) {

+    $line =~ s/[\r\n]+$//;

+    if ($line =~ /^Biblical Texts:/) {

+	$mode = "bible";

+    }

+    elsif ($line =~ /^Commentaries:/) {

+	$mode = "comm";

+    }

+    elsif ($line =~ /^Dictionaries:/) {

+	$mode = "dict";

+    }

+    elsif ($line =~ /^Generic books:/) {

+	$mode = "genbook";

+    }

+    elsif ($line =~ /^([^:]+) : (.+)/) {

+	$bookid = $1;

+	$bookdesc = $2;

+	if ($mode eq "bible") {

+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookup \$nick \$uhost \$hand \$channel \$arg\n}\n\n";

+	    print TCL "bind pub - !s$bookid setver_s$bookid\nproc setver_s$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookups \$nick \$uhost \$hand \$channel \$arg\n}\n\n";

+

+	    if ($count_bible != 0) {

+		$putservtext_bible .= ", ";

+	    }

+	    if (($count_bible != 0) && ($count_bible % 5 == 0)) {

+		$putservtext_bible .= "\n";

+	    }

+	    $count_bible++;

+	    $putservtext_bible .= "$bookdesc (!$bookid)";

+	}

+	elsif ($mode eq "comm") {

+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookupc \$nick \$uhost \$hand \$channel \$arg\n}\n\n";

+

+	    if ($count_comm != 0) {

+		$putservtext_comm .= ", ";

+	    }

+	    if (($count_comm != 0) && ($count_comm % 5 == 0)) {

+		$putservtext_comm .= "\n";

+	    }

+	    $count_comm++;

+	    $putservtext_comm .= "$bookdesc (!$bookid)";

+	}

+	elsif ($mode eq "dict") {

+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookupd \$nick \$uhost \$hand \$channel \$arg\n}\n\n";

+

+	    if ($count_dict != 0) {

+		$putservtext_dict .= ", ";

+	    }

+	    if (($count_dict != 0) && ($count_dict % 5 == 0)) {

+		$putservtext_dict .= "\n";

+	    }

+	    $count_dict++;

+	    $putservtext_dict .= "$bookdesc (!$bookid)";

+	}

+	elsif ($mode eq "genbook") {

+	    # do nothing until diatheke supports genbooks

+	}

+    }

+}

+

+$putservtext_bible = "\n$putservtext_bible";

+$putservtext_bible =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;

+$putservtext_bible =~ s/, \"/,\"/gs;

+$putservtext_bible .= "\"\n";

+$putservtext_bible = "\tputserv \"NOTICE \$nick :Bibles ($count_bible):$putservtext_bible";

+$putservtext_bible = "proc printBibles \{nick\} \{\n$putservtext_bible\}\n";

+

+$putservtext_comm = "\n$putservtext_comm";

+$putservtext_comm =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;

+$putservtext_comm =~ s/, \"/,\"/gs;

+$putservtext_comm .= "\"\n";

+$putservtext_comm = "\tputserv \"NOTICE \$nick :Commentaries ($count_comm):$putservtext_comm";

+$putservtext_comm = "proc printComms \{nick\} \{\n$putservtext_comm\}\n";

+

+$putservtext_dict = "\n$putservtext_dict";

+$putservtext_dict =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;

+$putservtext_dict =~ s/, \"/,\"/gs;

+$putservtext_dict .= "\"\n";

+$putservtext_dict = "\tputserv \"NOTICE \$nick :Dictionaries, Lexicons, & Daily Devotionals ($count_dict):$putservtext_dict";

+$putservtext_dict = "proc printDicts \{nick\} \{\n$putservtext_dict\}\n";

+

+print TCL $putservtext_bible;

+print TCL $putservtext_comm;

+print TCL $putservtext_dict;

+

diff --git a/utilities/imp2ld.cpp b/utilities/imp2ld.cpp
index e9bd0c7..11f5d6b 100644
--- a/utilities/imp2ld.cpp
+++ b/utilities/imp2ld.cpp
@@ -36,7 +36,7 @@ using namespace sword;
 
 int main(int argc, char **argv) {
 
-	const char * helptext ="imp2ld 1.0 Lexicon/Dictionary/Daily Devotional/Glossary module creation tool for the SWORD Project\n  usage:\n   %s <filename> [modname] [ 4 (default) | 2 | z - module driver]\n";
+	const char * helptext ="imp2ld 1.0 Lexicon/Dictionary/Daily Devotional/Glossary module creation tool for the SWORD Project\n  usage:\n   %s <filename> [modname] [ 4 (default) | 2 | z - module driver] [entries per compression block]\n";
 
 	signed long i = 0;
 	string keybuffer;
@@ -44,6 +44,7 @@ int main(int argc, char **argv) {
 	string linebuffer;
 	char modname[16];
 	char links = 0;
+	long blockCount = 30;
 	std::vector<string> linkbuffer;
 
 	if (argc > 2) {
@@ -71,13 +72,25 @@ int main(int argc, char **argv) {
 		}
 	}
 
+	if (argc > 4) {
+		long bcTemp = atoi(argv[4]);
+		if (bcTemp > 0) {
+			blockCount = bcTemp;
+		}
+	}
+
 	SWModule *mod = 0;
 	SWKey *key, *linkKey;
 
 	switch (mode) {
 	case 3:
+#ifndef EXCLUDEZLIB
 		zLD::createModule(modname);
-		mod = new zLD(modname, 0, 0, 30, new ZipCompress());
+		mod = new zLD(modname, 0, 0, blockCount, new ZipCompress());
+#else
+		fprintf(stderr, "ERROR: %s: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library", *argv);
+		exit(-2);
+#endif
 		break;
 	case 2:
 		RawLD::createModule(modname);
diff --git a/utilities/imp2vs.cpp b/utilities/imp2vs.cpp
index 62d34a1..75d5dae 100644
--- a/utilities/imp2vs.cpp
+++ b/utilities/imp2vs.cpp
@@ -15,13 +15,17 @@
  *
  */
 
+#include <stdio.h>
 #include <iostream>
-#include <rawtext.h>
-#include <rawtext4.h>
-#include <versekey.h>
+
 #include <swbuf.h>
 #include <filemgr.h>
-#include <stdio.h>
+#include <versekey.h>
+#include <rawtext.h>
+#include <rawtext4.h>
+#include <ztext.h>
+#include <lzsscomprs.h>
+#include <zipcomprs.h>
 
 #ifndef NO_SWORD_NAMESPACE
 using namespace sword;
@@ -36,8 +40,12 @@ void usage(const char *progName, const char *error = 0) {
 	fprintf(stderr, "\n=== imp2vs (Revision $Rev: 2234 $) SWORD Bible/Commentary importer.\n");
 	fprintf(stderr, "\nusage: %s <imp_file> [options]\n", progName);
 	fprintf(stderr, "  -a\t\t\t augment module if exists (default is to create new)\n");
+	fprintf(stderr, "  -z\t\t\t use ZIP compression (default no compression)\n");
+	fprintf(stderr, "  -Z\t\t\t use LZSS compression (default no compression)\n");
 	fprintf(stderr, "  -o <output_path>\t where to write data files.\n");
 	fprintf(stderr, "  -4\t\t\t use 4 byte size entries (default is 2).\n");
+	fprintf(stderr, "  -b <2|3|4>\t\t compression block size (default 4):\n");
+	fprintf(stderr, "\t\t\t\t 2 - verse; 3 - chapter; 4 - book\n");
 	fprintf(stderr, "  -v <v11n>\t\t specify a versification scheme to use (default is KJV)\n");
 	fprintf(stderr, "\t\t\t\t Note: The following are valid values for v11n:\n");
 	VerseMgr *vmgr = VerseMgr::getSystemVerseMgr();
@@ -74,14 +82,34 @@ int main(int argc, char **argv) {
 	SWBuf outPath          = "./";
 	bool fourByteSize      = false;
 	bool append            = false;
+	int iType              = 4;
+	SWCompress *compressor = 0;
+	SWBuf compType         = "";
 
 	for (int i = 2; i < argc; i++) {
 		if (!strcmp(argv[i], "-a")) {
 			append = true;
 		}
-		if (!strcmp(argv[i], "-4")) {
+		else if (!strcmp(argv[i], "-z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (fourByteSize) usage(*argv, "Cannot specify both -z and -4");
+			compType = "ZIP";
+		}
+		else if (!strcmp(argv[i], "-Z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (fourByteSize) usage(*argv, "Cannot specify both -Z and -4");
+			compType = "LZSS";
+		}
+		else if (!strcmp(argv[i], "-4")) {
 			fourByteSize = true;
 		}
+		else if (!strcmp(argv[i], "-b")) {
+			if (i+1 < argc) {
+				iType = atoi(argv[++i]);
+				if ((iType >= 2) && (iType <= 4)) continue;
+			}
+			usage(*argv, "-b requires one of <2|3|4>");
+		}
 		else if (!strcmp(argv[i], "-o")) {
 			if (i+1 < argc) outPath = argv[++i];
 			else usage(progName, "-o requires <output_path>");
@@ -96,17 +124,53 @@ int main(int argc, char **argv) {
 	const VerseMgr::System *v = VerseMgr::getSystemVerseMgr()->getVersificationSystem(v11n);
 	if (!v) std::cout << "Warning: Versification " << v11n << " not found. Using KJV versification...\n";
 
+	if (compType == "ZIP") {
+#ifndef EXCLUDEZLIB
+		compressor = new ZipCompress();
+#else
+		usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library");
+#endif
+	}
+	else if (compType == "LZSS") {
+		compressor = new LZSSCompress();
+	}
 
 	// setup module
 	if (!append) {
+		if (compressor) {
+			if (zText::createModule(outPath, iType, v11n)) {
+				fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", *argv, outPath.c_str());
+				exit(-1);
+			}
+		}
 		if (!fourByteSize)
 			RawText::createModule(outPath, v11n);
 		else	RawText4::createModule(outPath, v11n);
 	}
 
-	SWModule *module = (!fourByteSize)
+	SWModule *module = 0;
+	if (compressor) {
+		// Create a compressed text module allowing very large entries
+		// Taking defaults except for first, fourth, fifth and last argument
+		module = new zText(
+				outPath,		// ipath
+				0,		// iname
+				0,		// idesc
+				iType,		// iblockType
+				compressor,	// icomp
+				0,		// idisp
+				ENC_UNKNOWN,	// enc
+				DIRECTION_LTR,	// dir
+				FMT_UNKNOWN,	// markup
+				0,		// lang
+				v11n		// versification
+		       );
+	}
+	else {
+		module = (!fourByteSize)
 			? (SWModule *)new RawText(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, v11n)
 			: (SWModule *)new RawText4(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, v11n);
+	}
 	// -----------------------------------------------------
 			
 
diff --git a/utilities/installmgr.cpp b/utilities/installmgr.cpp
index d4a8cb2..a56aa37 100644
--- a/utilities/installmgr.cpp
+++ b/utilities/installmgr.cpp
@@ -17,6 +17,7 @@
 
 #include <swmgr.h>
 #include <installmgr.h>
+#include <ftptrans.h>
 #include <filemgr.h>
 #include <iostream>
 #include <map>
@@ -31,15 +32,17 @@ using std::cin;
 using std::map;
 
 
-SWMgr *mgr;
-InstallMgr *installMgr;
+SWMgr *mgr = 0;
+InstallMgr *installMgr = 0;
+StatusReporter *statusReporter = 0;
 SWBuf baseDir;
 SWBuf confPath;
 
+void usage(const char *progName = 0, const char *error = 0);
 
 class MyInstallMgr : public InstallMgr {
 public:
-	MyInstallMgr(const char *privatePath = "./") : InstallMgr(privatePath) {}
+	MyInstallMgr(const char *privatePath = "./", StatusReporter *sr = 0) : InstallMgr(privatePath, sr) {}
 
 virtual bool isUserDisclaimerConfirmed() const {
 	static bool confirmed = false;
@@ -65,27 +68,69 @@ virtual bool isUserDisclaimerConfirmed() const {
 		char prompt[10];
 		fgets(prompt, 9, stdin);
 		confirmed = (!strcmp(prompt, "yes\n"));
+		cout << "\n";
 	}
 	return confirmed;
 }
 
 };
 
+class MyStatusReporter : public StatusReporter {
+	int last;
+        virtual void statusUpdate(double dltotal, double dlnow) {
+		int p = 74 * (dlnow / dltotal);
+		for (;last < p; ++last) {
+			if (!last) {
+				SWBuf output;
+				output.setFormatted("[ File Bytes: %ld", (long)dltotal);
+				while (output.size() < 75) output += " ";
+				output += "]";
+				cout << output.c_str() << "\n ";
+			}
+			cout << "-";
+		}
+		cout.flush();
+	}
+        virtual void preStatus(long totalBytes, long completedBytes, const char *message) {
+		SWBuf output;
+		output.setFormatted("[ Total Bytes: %ld; Completed Bytes: %ld", totalBytes, completedBytes);
+		while (output.size() < 75) output += " ";
+		output += "]";
+		cout << "\n" << output.c_str() << "\n ";
+		int p = 74 * ((double)completedBytes/totalBytes);
+		for (int i = 0; i < p; ++i) { cout << "="; }
+		cout << "\n\n" << message << "\n";
+		last = 0;
+	}
+};      
+
 
 void init() {
-	mgr = new SWMgr();
-	SWBuf baseDir = mgr->getHomeDir();
-	if (baseDir.length() < 1) baseDir = ".";
-	baseDir += "/.sword/InstallMgr";
-	confPath = baseDir + "/InstallMgr.conf";
-	installMgr = new MyInstallMgr(baseDir);
+	if (!mgr) {
+		mgr = new SWMgr();
+
+		if (!mgr->config)
+			usage(0, "ERROR: SWORD configuration not found.  Please configure SWORD before using this program.");
+
+		SWBuf baseDir = mgr->getHomeDir();
+		if (baseDir.length() < 1) baseDir = ".";
+		baseDir += "/.sword/InstallMgr";
+		confPath = baseDir + "/InstallMgr.conf";
+		statusReporter = new MyStatusReporter();
+		installMgr = new MyInstallMgr(baseDir, statusReporter);
+	}
 }
 
 
 // clean up and exit if status is 0 or negative error code
 void finish(int status) {
+	delete statusReporter;
 	delete installMgr;
 	delete mgr;
+
+	installMgr = 0;
+	mgr        = 0;
+
 	if (status < 1) {
 		cout << "\n";
 		exit(status);
@@ -93,25 +138,6 @@ void finish(int status) {
 }
 
 
-void usage(const char *progName) {
-	fprintf(stderr, "usage: %s <option>\nOptions:\n"
-		"\t-init\t\t\t\tcreate a basic user config file.\n"
-		"\t-sc\t\t\t\tsync config with known remote repo list\n"
-		"\t\t\t\t\t\tWARNING: overwrites existing.\n"
-		"\t-l\t\t\t\tlist installed modules\n"
-		"\t-u <modName>\t\t\tuninstall module\n"
-		"\t-s\t\t\t\tlist remote sources\n"
-		"\t-r  <remoteSrcName>\t\trefresh remote source\n"
-		"\t-rl <remoteSrcName>\t\tlist available modules from remote source\n"
-		"\t-rd <remoteSrcName>\t\tlist new/updated modules from remote source\n"
-		"\t-ri <remoteSrcName> <modName>\tinstall module from remote source\n"
-		"\t-ll <path>\t\t\tlist available modules at local path\n"
-		"\t-li <path> <modName>\t\tinstall module from local path\n"
-		, progName);
-	finish(-1);
-}
-
-
 void createBasicConfig(bool enableRemote, bool addCrossWire) {
 
 	FileMgr::createParent(confPath.c_str());
@@ -132,6 +158,7 @@ void createBasicConfig(bool enableRemote, bool addCrossWire) {
 
 
 void initConfig() {
+	init();
 
 	bool enable = installMgr->isUserDisclaimerConfirmed();
 
@@ -143,12 +170,14 @@ void initConfig() {
 
 
 void syncConfig() {
+	init();
 
 	if (!installMgr->isUserDisclaimerConfirmed()) {  // assert disclaimer is accepted
 		cout << "\n\nDisclaimer not accepted.  Aborting.";
 		return;
 	}
 
+	// be sure we have at least some config file already out there
 	if (!FileMgr::existsFile(confPath.c_str())) {
 		createBasicConfig(true, false);
 		finish(1); // cleanup and don't exit
@@ -161,24 +190,8 @@ void syncConfig() {
 }
 
 
-void listModules(SWMgr *otherMgr) {
-	cout << "Installed Modules:\n\n";
-	SWModule *module;
-	std::map<SWModule *, int> mods = InstallMgr::getModuleStatus(*mgr, *otherMgr);
-	for (std::map<SWModule *, int>::iterator it = mods.begin(); it != mods.end(); it++) {
-		module = it->first;
-		SWBuf version = module->getConfigEntry("Version");
-		SWBuf status = " ";
-		if (it->second & InstallMgr::MODSTAT_NEW) status = "*";
-		if (it->second & InstallMgr::MODSTAT_OLDER) status = "-";
-		if (it->second & InstallMgr::MODSTAT_UPDATED) status = "+";
-
-		cout << status << "[" << module->Name() << "]  \t(" << version << ")  \t- " << module->Description() << "\n";
-	}
-}
-
-
 void uninstallModule(const char *modName) {
+	init();
 	SWModule *module;
 	ModMap::iterator it = mgr->Modules.find(modName);
 	if (it == mgr->Modules.end()) {
@@ -192,6 +205,7 @@ void uninstallModule(const char *modName) {
 
 
 void listRemoteSources() {
+	init();
 	cout << "Remote Sources:\n\n";
 	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
 		cout << "[" << it->second->caption << "]\n";
@@ -203,6 +217,7 @@ void listRemoteSources() {
 
 
 void refreshRemoteSource(const char *sourceName) {
+	init();
 	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
 	if (source == installMgr->sources.end()) {
 		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
@@ -210,41 +225,40 @@ void refreshRemoteSource(const char *sourceName) {
 	}
 
 	if (!installMgr->refreshRemoteSource(source->second))
-		cout << "Remote Source Refreshed\n";
-	else	cerr << "Error Refreshing Remote Source\n";
+		cout << "\nRemote Source Refreshed\n";
+	else	cerr << "\nError Refreshing Remote Source\n";
 }
 
 
-void remoteNewModules(const SWMgr *base, const char *sourceName) {
-	cout << "Updated and New Modules:\n(be sure to refresh remote source (-r) first for most current list)\n\n";
-	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
-	if (source == installMgr->sources.end()) {
-		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
-		finish(-3);
-	}
-	map<SWModule *, int> modStats = installMgr->getModuleStatus(*base, *source->second->getMgr());
+void listModules(SWMgr *otherMgr = 0, bool onlyNewAndUpdates = false) {
+	init();
 	SWModule *module;
-	int status;
-	bool updated;
-	for (map<SWModule *, int>::iterator it = modStats.begin(); it != modStats.end(); it++) {
+	if (!otherMgr) otherMgr = mgr;
+	std::map<SWModule *, int> mods = InstallMgr::getModuleStatus(*mgr, *otherMgr);
+	for (std::map<SWModule *, int>::iterator it = mods.begin(); it != mods.end(); it++) {
 		module = it->first;
-		status = it->second;
-		updated = (status & InstallMgr::MODSTAT_UPDATED);
-		if ((status & InstallMgr::MODSTAT_NEW) || (updated)) {
-			cout << ((updated)?"U":"N") << " [" << module->Name() << "]  \t- " << module->Description() << "\n";
+		SWBuf version = module->getConfigEntry("Version");
+		SWBuf status = " ";
+		if (it->second & InstallMgr::MODSTAT_NEW) status = "*";
+		if (it->second & InstallMgr::MODSTAT_OLDER) status = "-";
+		if (it->second & InstallMgr::MODSTAT_UPDATED) status = "+";
+
+		if (!onlyNewAndUpdates || status == "*" || status == "+") {
+			cout << status << "[" << module->Name() << "]  \t(" << version << ")  \t- " << module->Description() << "\n";
 		}
 	}
 }
 
 
-void remoteListModules(const char *sourceName) {
+void remoteListModules(const char *sourceName, bool onlyNewAndUpdated = false) {
+	init();
 	cout << "Available Modules:\n(be sure to refresh remote source (-r) first for most current list)\n\n";
 	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
 	if (source == installMgr->sources.end()) {
 		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
 		finish(-3);
 	}
-	listModules(source->second->getMgr());
+	listModules(source->second->getMgr(), onlyNewAndUpdated);
 }
 
 
@@ -256,6 +270,7 @@ void localDirListModules(const char *dir) {
 
 
 void remoteInstallModule(const char *sourceName, const char *modName) {
+	init();
 	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
 	if (source == installMgr->sources.end()) {
 		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
@@ -273,12 +288,13 @@ void remoteInstallModule(const char *sourceName, const char *modName) {
 
 	int error = installMgr->installModule(mgr, 0, module->Name(), is);
 	if (error) {
-		cout << "Error installing module: [" << module->Name() << "] (write permissions?)\n";
-	} else cout << "Installed module: [" << module->Name() << "]\n";
+		cout << "\nError installing module: [" << module->Name() << "] (write permissions?)\n";
+	} else cout << "\nInstalled module: [" << module->Name() << "]\n";
 }
 
 
 void localDirInstallModule(const char *dir, const char *modName) {
+	init();
 	SWMgr lmgr(dir);
 	SWModule *module;
 	ModMap::iterator it = lmgr.Modules.find(modName);
@@ -289,88 +305,94 @@ void localDirInstallModule(const char *dir, const char *modName) {
 	module = it->second;
 	int error = installMgr->installModule(mgr, dir, module->Name());
 	if (error) {
-		cout << "Error installing module: [" << module->Name() << "] (write permissions?)\n";
-	} else cout << "Installed module: [" << module->Name() << "]\n";
+		cout << "\nError installing module: [" << module->Name() << "] (write permissions?)\n";
+	} else cout << "\nInstalled module: [" << module->Name() << "]\n";
+}
+
+
+void usage(const char *progName, const char *error) {
+
+	if (error) fprintf(stderr, "\n%s: %s\n", (progName ? progName : "installmgr"), error);
+
+	fprintf(stderr, "\nusage: %s <command> [command ...]\n"
+		"\n  Commands (run in order they are passed):\n\n"
+		"\t-init\t\t\t\tcreate a basic user config file.\n"
+		"\t\t\t\t\t\tWARNING: overwrites existing.\n"
+		"\t-sc\t\t\t\tsync config with known remote repo list\n"
+		"\t\t\t\t\t\tNOTE: also creates if none exists\n"
+		"\t-d\t\t\t\tturn debug output on\n"
+		"\t-l\t\t\t\tlist installed modules\n"
+		"\t-u <modName>\t\t\tuninstall module\n"
+		"\t-s\t\t\t\tlist remote sources\n"
+		"\t-r  <remoteSrcName>\t\trefresh remote source\n"
+		"\t-rl <remoteSrcName>\t\tlist available modules from remote source\n"
+		"\t-rd <remoteSrcName>\t\tlist new/updated modules from remote source\n"
+		"\t-ri <remoteSrcName> <modName>\tinstall module from remote source\n"
+		"\t-ll <path>\t\t\tlist available modules at local path\n"
+		"\t-li <path> <modName>\t\tinstall module from local path\n"
+		, (progName ? progName : "installmgr"));
+	finish(-1);
 }
 
 
 int main(int argc, char **argv) {
 
-	init();
+	if (argc < 2) usage(*argv);
 
-	SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG);
-
-	cout << "\n";
-
-	if (argc < 2)
-		usage(*argv);
-
-	switch (argv[1][1]) {
-	case 'i':
-		if (strcmp(argv[1], "-init"))
-			usage(*argv);
-		initConfig();
-		break;
-	case 'l':
-		switch (argv[1][2]) {
-		case 0:			// -l list installed modules
-			listModules(mgr);
-			break;
-		case 'l':		// -ll list from local directory
-			if (argc < 3)
-				usage(*argv);
-			localDirListModules(argv[2]);
-			break;
-		case 'i':		// -li remote install
-			if (argc < 4)
-				usage(*argv);
-			localDirInstallModule(argv[2], argv[3]);
-			break;
-		default: usage(*argv);
+	for (int i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "-d")) {
+			SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG);
+		}
+		else if (!strcmp(argv[i], "-init")) {
+			initConfig();
+		}
+		else if (!strcmp(argv[i], "-l")) {	// list installed modules
+			cout << "Installed Modules:\n\n";
+			listModules();
+		}
+		else if (!strcmp(argv[i], "-ll")) {	// list from local directory
+			if (i+1 < argc) localDirListModules(argv[++i]);
+			else usage(*argv, "-ll requires <path>");
+		}
+		else if (!strcmp(argv[i], "-li")) {	// install from local directory
+			if (i+2 < argc) {
+				const char *path = argv[++i];
+				const char *modName = argv[++i];
+				localDirInstallModule(path, modName);
+			}
+			else usage(*argv, "-li requires <path> <modName>");
 		}
-		break;
-	case 'u':
-		if (argc < 3)
-			usage(*argv);
-
-		uninstallModule(argv[2]);
-		break;
-	case 's':
-		switch (argv[1][2]) {
-		case 0:			// -s list sources
+		else if (!strcmp(argv[i], "-u")) {	// uninstall module
+			if (i+1 < argc) uninstallModule(argv[++i]);
+			else usage(*argv, "-u requires <modName>");
+		}
+		else if (!strcmp(argv[i], "-s")) {	// list sources
 			listRemoteSources();
-			break;
-		case 'c':		// -sc sync config with master
+		}
+		else if (!strcmp(argv[i], "-sc")) {	// sync config with master
 			syncConfig();
-			break;
 		}
-		break;
-	case 'r':	// remote option
-		switch (argv[1][2]) {
-		case 0:			// -r refresh
-			if (argc < 3)
-				usage(*argv);
-			refreshRemoteSource(argv[2]);
-			break;
-		case 'l':		// -rl remote list
-			if (argc < 3)
-				usage(*argv);
-			remoteListModules(argv[2]);
-			break;
-		case 'd':		// -rl remote list
-			if (argc < 3)
-				usage(*argv);
-			remoteNewModules(mgr, argv[2]);
-			break;
-		case 'i':		// -ri remote install
-			if (argc < 4)
-				usage(*argv);
-			remoteInstallModule(argv[2], argv[3]);
-			break;
-		default: usage(*argv);
+		else if (!strcmp(argv[i], "-r")) {	// refresh remote source
+			if (i+1 < argc) refreshRemoteSource(argv[++i]);
+			else usage(*argv, "-r requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-rl")) {	// list remote modules
+			if (i+1 < argc) remoteListModules(argv[++i]);
+			else usage(*argv, "-rl requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-rd")) {	// list differences between remote source and installed modules
+			if (i+1 < argc) remoteListModules(argv[++i], true);
+			else usage(*argv, "-rd requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-ri")) {	// install from remote directory
+			if (i+2 < argc) {
+				const char *source = argv[++i];
+				const char *modName = argv[++i];
+				remoteInstallModule(source, modName);
+			}
+			else usage(*argv, "-ri requires <remoteSrcName> <modName>");
 		}
-		break;
-	default: usage(*argv);
+		else usage(*argv, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
 	}
 
 	finish(0);
diff --git a/utilities/mkfastmod.cpp b/utilities/mkfastmod.cpp
index bee620e..8e0aaf2 100644
--- a/utilities/mkfastmod.cpp
+++ b/utilities/mkfastmod.cpp
@@ -79,9 +79,10 @@ int main(int argc, char **argv)
 	target->deleteSearchFramework();
 	printf("Building framework, please wait...\n");
 	char lineLen = 70;
-	printf("[0=================================50===============================100]\n ");
+	printf("[0=================================50==============================100]\n ");
 	char error = target->createSearchFramework(&percentUpdate, &lineLen);
 	if (error) {
 		fprintf(stderr, "%s: couldn't create search framework (permissions?)\n", *argv);
 	}
+	printf("\n");
 }
diff --git a/utilities/osis2mod.cpp b/utilities/osis2mod.cpp
index 473a90f..3dea0c4 100644
--- a/utilities/osis2mod.cpp
+++ b/utilities/osis2mod.cpp
@@ -50,9 +50,7 @@ using namespace sword;
 
 using namespace std;
 
-// Turn debugging on and off
-//#define DEBUG
-int       debug            =   0;
+int       debug            =   0; // mask of debug flags
 const int DEBUG_WRITE      =   1; // writing to module
 const int DEBUG_VERSE      =   2; // verse start and end
 const int DEBUG_QUOTE      =   4; // quotes, especially Words of Christ (WOC)
@@ -232,11 +230,10 @@ void prepareSWVerseKey(SWBuf &buf) {
 	bool inRange = false;
 	while (*p) {
 		if (inRange) {
-#ifdef DEBUG
-		if (debug & DEBUG_REF) {
-			cout << "DEBUG(REF): Copy range marker:" << *p << endl;;
-		}
-#endif
+			if (debug & DEBUG_REF) {
+				cout << "DEBUG(REF): Copy range marker:" << *p << endl;;
+			}
+
 			// Range markers are copied as is
 			*s++ = *p++;
 		}
@@ -252,7 +249,7 @@ void prepareSWVerseKey(SWBuf &buf) {
 		if (*n == ':') {
 			// set p to skip the work prefix
 			p = n + 1;
-#ifdef DEBUG
+
 			if (debug & DEBUG_REF) {
 				cout << "DEBUG(REF): Found a work prefix ";
 				for (char *x = s; x <= n; x++) {
@@ -260,29 +257,25 @@ void prepareSWVerseKey(SWBuf &buf) {
 				}
 				cout << endl;
 			}
-#endif
 		}
 
 		// Now we are in the meat of an osisID.
 		// Copy it to its end but stop on a grain marker of '!'
-#ifdef DEBUG
 		if (debug & DEBUG_REF) {
 			cout << "DEBUG(REF): Copy osisID:";
 		}
-#endif
+
 		while (*p && *p != '!' && *p != ' ' && *p != '-') {
-#ifdef DEBUG
 			if (debug & DEBUG_REF) {
 				cout << *p;
 			}
-#endif
+
 			*s++ = *p++;
 		}
-#ifdef DEBUG
+
 		if (debug & DEBUG_REF) {
 			cout << endl;
 		}
-#endif
 
 		// The ! and everything following until we hit
 		// the end of the osisID is part of the grain reference
@@ -291,7 +284,7 @@ void prepareSWVerseKey(SWBuf &buf) {
 			while (*n && *n != ' ' && *n != '-') {
 				n++;
 			}
-#ifdef DEBUG
+
 			if (debug & DEBUG_REF) {
 				cout << "DEBUG(REF): Found a grain suffix ";
 				for (char *x = p; x < n; x++) {
@@ -299,7 +292,7 @@ void prepareSWVerseKey(SWBuf &buf) {
 				}
 				cout << endl;
 			}
-#endif
+
 			p = n;
 		}
 
@@ -309,13 +302,11 @@ void prepareSWVerseKey(SWBuf &buf) {
 		// then we are entering a range
 		inRange = !inRange && *p == '-';
 
-#ifdef DEBUG
 		if (debug & DEBUG_REF) {
 			if (inRange) {
 				cout << "DEBUG(REF): Found a range" << endl;
 			}
 		}
-#endif
 
 		// between ranges and stand alone osisIDs we might have whitespace
 		if (!inRange && *p == ' ') {
@@ -323,13 +314,13 @@ void prepareSWVerseKey(SWBuf &buf) {
 			while (*p == ' ') {
 				p++;
 			}
+
 			// replacing them all with a ';'
 			*s++ = ';';
-#ifdef DEBUG
+
 			if (debug & DEBUG_REF) {
 				cout << "DEBUG(REF): replacing space with ;. Remaining: " << p << endl;
 			}
-#endif
 		}
 	}
 
@@ -340,11 +331,10 @@ void prepareSWVerseKey(SWBuf &buf) {
 		*s = '\0';
 		// Since we modified the swbuf, we need to tell it what we have done
 		buf.setSize(s - buf.c_str());
-#ifdef DEBUG
+
 		if (debug & DEBUG_REF) {
 			cout << "DEBUG(REF): shortended keyVal to`" << buf.c_str() << "`"<< endl;
 		}
-#endif
 	}
 }
 
@@ -383,11 +373,9 @@ bool isValidRef(const char *buf) {
 	// If we have gotten here the reference is not in the selected versification.
 	cout << "INFO(V11N): " << before << " is not in the " << currentVerse.getVersificationSystem() << " versification." << endl;
 
-#ifdef DEBUG
 	if (debug & DEBUG_REV11N) {
 		cout << "DEBUG(V11N): " << before << " normalizes to "  << after << endl;
 	}
-#endif
 
 	return false;
 }
@@ -421,11 +409,9 @@ void makeValidRef(VerseKey &key) {
 	int chapterMax = key.getChapterMax();
 	int verseMax   = key.getVerseMax();
 
-#ifdef DEBUG
 	if (debug & DEBUG_REV11N) {
 		cout << "DEBUG(V11N) Chapter max:" << chapterMax << ", Verse Max:" << verseMax << endl;
 	}
-#endif
 
 	cout << "INFO(V11N): " << key.getOSISRef() << " is not in the " << key.getVersificationSystem() << " versification.";
 	// Since isValidRef returned false constrain the key to the nearest prior reference.
@@ -466,7 +452,7 @@ void makeValidRef(VerseKey &key) {
 void writeEntry(SWBuf &text, bool force = false) {
 	char keyOsisID[255];
 
-	static const char* revision = "<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev: 2400 $\"/>";
+	static const char* revision = "<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev: 2478 $\"/>";
 	static bool firstOT = true;
 	static bool firstNT = true;
 
@@ -535,11 +521,9 @@ void writeEntry(SWBuf &text, bool force = false) {
 			activeVerseText = currentText + " " + activeVerseText;
 		}
 
-#ifdef DEBUG
 		if (debug & DEBUG_WRITE) {
 			cout << "DEBUG(WRITE): " << activeOsisID << ":" << currentVerse.getOSISRef() << ": " << activeVerseText << endl;
 		}
-#endif
 
 		module->setEntry(activeVerseText);
 		activeVerseText = "";
@@ -588,11 +572,11 @@ void linkToEntry(VerseKey &linkKey, VerseKey &dest) {
 //		false if the what has been seen is to be accumulated and considered later.
 bool handleToken(SWBuf &text, XMLTag token) {
 
-	// Everything between the begin book tag and the first begin chapter tag is inBookHeader
-	static bool               inBookHeader    = false;
+	// Everything between the begin book tag and the first begin chapter tag is inBookIntro
+	static bool               inBookIntro     = false;
 
-	// Everything between the begin chapter tag and the first begin verse tag is inChapterHeader
-	static bool               inChapterHeader = false;
+	// Everything between the begin chapter tag and the first begin verse tag is inChapterIntro
+	static bool               inChapterIntro  = false;
 
 	// Flags indicating whether we are processing the content of a chapter
 	static bool               inChapter       = false;
@@ -612,6 +596,12 @@ bool handleToken(SWBuf &text, XMLTag token) {
 	// Flag used to indicate where useful text begins
 	static bool               firstDiv        = false;
 
+	// Retain the sID of book, chapter and verse (commentary) divs so that we can find them again.
+	// This relies on transformBSP.
+	static SWBuf              sidBook         = "";
+	static SWBuf              sidChapter      = "";
+	static SWBuf              sidVerse        = "";
+
 	// Stack of quote elements used to handle Words of Christ
 	static std::stack<XMLTag> quoteStack;
 
@@ -628,9 +618,10 @@ bool handleToken(SWBuf &text, XMLTag token) {
 	static int                verseDepth      = 0;
 
 	int                       tagDepth        = tagStack.size();
-	const char               *tokenName       = token.getName();
+	SWBuf                     tokenName       = token.getName();
 	bool                      isEndTag        = token.isEndTag() || token.getAttribute("eID");
-	const char               *typeAttr        = token.getAttribute("type");
+	SWBuf                     typeAttr        = token.getAttribute("type");
+	SWBuf                     eidAttr         = token.getAttribute("eID");
 
 	// process start tags
 	if (!isEndTag) {
@@ -638,21 +629,19 @@ bool handleToken(SWBuf &text, XMLTag token) {
 		// Remember non-empty start tags
 		if (!token.isEmpty()) {
 			tagStack.push(token);
-#ifdef DEBUG
+
 			if (debug & DEBUG_STACK) {
 				cout << "DEBUG(STACK): " << currentOsisID << ": push (" << tagStack.size() << ") " << token.getName() << endl;
 			}
-#endif
 		}
 
 		// throw away everything up to the first div
 		if (!firstDiv) {
-			if (!strcmp(tokenName, "div")) {
-#ifdef DEBUG
+			if (tokenName == "div") {
 				if (debug & DEBUG_OTHER) {
 					cout << "DEBUG(FOUND): Found first div and pitching prior material: " << text << endl;
 				}
-#endif
+
 				// TODO: Save off the content to use it to suggest the module's conf.
 				firstDiv = true;
 				text     = "";
@@ -668,15 +657,15 @@ bool handleToken(SWBuf &text, XMLTag token) {
 		if (token.getAttribute("osisID") || token.getAttribute("annotateRef")) {
 
 			// BOOK START, <div type="book" ...>
-			if ((!strcmp(tokenName, "div")) && (typeAttr && !strcmp(typeAttr, "book"))) {
-				if (inBookHeader || inChapterHeader) {	// this one should never happen, but just in case
-#ifdef DEBUG
+			if (tokenName == "div" && typeAttr == "book") {
+				if (inBookIntro || inChapterIntro) {	// this one should never happen, but just in case
+
 					if (debug & DEBUG_TITLE) {
-						cout << "DEBUG(TITLE): " << currentOsisID << ": OOPS HEADING " << endl;
-						cout << "\tinChapterHeader = " << inChapterHeader << endl;
-						cout << "\tinBookHeader = " << inBookHeader << endl;
+						cout << "DEBUG(TITLE): " << currentOsisID << ": OOPS INTRO " << endl;
+						cout << "\tinChapterIntro = " << inChapterIntro << endl;
+						cout << "\tinBookIntro = " << inBookIntro << endl;
 					}
-#endif
+
 					currentVerse.Testament(0);
 					currentVerse.Book(0);
 					currentVerse.Chapter(0);
@@ -688,11 +677,16 @@ bool handleToken(SWBuf &text, XMLTag token) {
 				currentVerse.Verse(0);
 				strcpy(currentOsisID, currentVerse.getOSISRef());
 
+				sidBook         = token.getAttribute("sID");
 				inChapter       = false;
 				inVerse         = false;
 				inPreVerse      = false;
-				inBookHeader    = true;
-				inChapterHeader = false;
+				inBookIntro     = true;
+				inChapterIntro  = false;
+
+				if (debug & DEBUG_TITLE) {
+					cout << "DEBUG(TITLE): " << currentOsisID << ": Looking for book introduction" << endl;
+				}
 
 				bookDepth       = tagStack.size();
 				chapterDepth    = 0;
@@ -702,42 +696,44 @@ bool handleToken(SWBuf &text, XMLTag token) {
 				if (!inCanonicalOSISBook) {
 					cout << "WARNING(V11N): New book is " << token.getAttribute("osisID") << " and is not in " << v11n << " versification, ignoring" << endl;
 				}
-#ifdef DEBUG
 				else if (debug & DEBUG_OTHER) {
 					cout << "DEBUG(FOUND): New book is " << currentVerse.getOSISRef() << endl;
 				}
-#endif
 
 				return false;
 			}
 
-			// CHAPTER START, <div type="chapter" ...> or <chapter ...>
-			if (((!strcmp(tokenName, "div")) && (typeAttr && !strcmp(typeAttr, "chapter"))) ||
-			     (!strcmp(tokenName, "chapter"))
-			   ) {
-				if (inBookHeader) {
-#ifdef DEBUG
+			// CHAPTER START, <chapter> or <div type="chapter" ...>
+			if ((tokenName == "chapter") ||
+			    (tokenName == "div" && typeAttr == "chapter")
+			) {
+				if (inBookIntro) {
 					if (debug & DEBUG_TITLE) {
-						cout << "DEBUG(TITLE): " << currentOsisID << ": BOOK HEADING "<< text.c_str() << endl;
+						cout << "DEBUG(TITLE): " << currentOsisID << ": BOOK INTRO "<< text << endl;
 					}
-#endif
+
 					writeEntry(text);
 				}
 
 				currentVerse = token.getAttribute("osisID");
 				currentVerse.Verse(0);
-#ifdef DEBUG
+
 				if (debug & DEBUG_OTHER) {
 					cout << "DEBUG(FOUND): Current chapter is " << currentVerse.getOSISRef() << " (" << token.getAttribute("osisID") << ")" << endl;
 				}
-#endif
+
 				strcpy(currentOsisID, currentVerse.getOSISRef());
 
+				sidChapter      = token.getAttribute("sID");
 				inChapter       = true;
 				inVerse         = false;
 				inPreVerse      = false;
-				inBookHeader    = false;
-				inChapterHeader = true;
+				inBookIntro     = false;
+				inChapterIntro  = true;
+
+				if (debug & DEBUG_TITLE) {
+					cout << "DEBUG(TITLE): " << currentOsisID << ": Looking for chapter introduction" << endl;
+				}
 
 				chapterDepth    = tagStack.size();
 				verseDepth      = 0;
@@ -746,27 +742,25 @@ bool handleToken(SWBuf &text, XMLTag token) {
 			}
 
 			// VERSE, <verse ...> OR COMMENTARY START, <div annotateType="xxx" ...>
-			if (!strcmp(tokenName, "verse") ||
-			   (!strcmp(tokenName, "div") && token.getAttribute("annotateType"))) {
-#ifdef DEBUG
+			if ((tokenName == "verse") ||
+			    (tokenName == "div" && token.getAttribute("annotateType"))
+			) {
 				if (debug & DEBUG_OTHER) {
 					cout << "DEBUG(FOUND): Entering verse" << endl;
 				}
-#endif
-				if (inChapterHeader) {
-					SWBuf heading = text;
-					text = "";
 
-					if (heading.length()) {
-#ifdef DEBUG
+				if (inChapterIntro) {
+					if (debug & DEBUG_TITLE) {
+						cout << "DEBUG(TITLE): " << currentOsisID << ": Done looking for chapter introduction" << endl;
+					}
+
+					if (text.length()) {
 						if (debug & DEBUG_TITLE) {
-							cout << "DEBUG(TITLE): " << currentOsisID << ": CHAPTER HEADING "<< heading.c_str() << endl;
+							cout << "DEBUG(TITLE): " << currentOsisID << ": CHAPTER INTRO "<< text << endl;
 						}
-#endif
-						writeEntry(heading);
-					}
 
-					inChapterHeader = false;
+						writeEntry(text);
+					}
 				}
 
 				// Did we have pre-verse material that needs to be marked?
@@ -777,7 +771,7 @@ bool handleToken(SWBuf &text, XMLTag token) {
 				}
 
 				// Get osisID for verse or annotateRef for commentary
-				SWBuf keyVal = token.getAttribute(strcmp(tokenName, "verse") ? "annotateRef" : "osisID");
+				SWBuf keyVal = token.getAttribute(tokenName == "verse" ? "osisID" : "annotateRef");
 
 				// Massage the key into a form that ParseVerseList can accept
 				prepareSWVerseKey(keyVal);
@@ -802,28 +796,27 @@ bool handleToken(SWBuf &text, XMLTag token) {
 					}
 				}
 				else {
-					cout << "ERROR(REF): Invalid osisID/annotateRef: " << token.getAttribute(strcmp(tokenName, "verse") ? "annotateRef" : "osisID") << endl;
+					cout << "ERROR(REF): Invalid osisID/annotateRef: " << token.getAttribute((tokenName == "verse") ? "osisID" : "annotateRef") << endl;
 				}
 
 				strcpy(currentOsisID, currentVerse.getOSISRef());
-#ifdef DEBUG
+
 				if (debug & DEBUG_OTHER) {
 					cout << "DEBUG(FOUND): New current verse is " << currentVerse.getOSISRef() << endl;
 					cout << "DEBUG(FOUND): osisID/annotateRef is adjusted to: " << keyVal << endl;
 				}
-#endif
 
+				sidVerse        = token.getAttribute("sID");
 				inVerse         = true;
 				inPreVerse      = false;
-				inBookHeader    = false;
-				inChapterHeader = false;
+				inBookIntro     = false;
+				inChapterIntro  = false;
 				verseDepth      = tagStack.size();
 
 				// Include the token if it is not a verse
-				if (strcmp(tokenName, "verse")) {
+				if (tokenName != "verse") {
 					text.append(token);
 				}
-#ifdef DEBUG
 				else if (debug & DEBUG_VERSE)
 				{
 					// transform the verse into a milestone
@@ -836,7 +829,6 @@ bool handleToken(SWBuf &text, XMLTag token) {
 					}
 					text.append(t);
 				}
-#endif
 
 				if (inWOC) {
 					text.append(wocTag);
@@ -850,13 +842,13 @@ bool handleToken(SWBuf &text, XMLTag token) {
 		// Handle WOC quotes.
 		// Note this requires transformBSP to make them into milestones
 		// Otherwise have to do it here
-		if (!strcmp(tokenName, "q")) {
+		if (tokenName == "q") {
 			quoteStack.push(token);
-#ifdef DEBUG
+
 			if (debug & DEBUG_QUOTE) {
 				cout << "DEBUG(QUOTE): " << currentOsisID << ": quote top(" << quoteStack.size() << ") " << token << endl;
 			}
-#endif
+
 			if (token.getAttribute("who") && !strcmp(token.getAttribute("who"), "Jesus")) {
 				inWOC = true;
 
@@ -882,30 +874,35 @@ bool handleToken(SWBuf &text, XMLTag token) {
 		// 1) Between the opening of a book and the first chapter, all the material is handled as an introduction to the book.
 		// 2) Between the opening of a chapter and the first verse, the material is split between the introduction of the chapter
 		//    and the first verse of the chapter.
-		//    A <div> with a type other than section will be taken as a chapter introduction.
-		//    A <title> of type acrostic, psalm or no type, will be taken as a title for the verse.
-		//    A <title> of type main or chapter will be seen as a chapter title.
+		//    A <div> with a type of section will be taken as surrounding verses.
+		//    A <title> of type other than main, chapter or sub, will be taken as a title for the verse.
+		//    Once one of these conditions is met, the division between chapter introduction and pre-verse is set.
 		// 3) Between verses, the material is split between the prior verse and the next verse.
 		//    Basically, while end and empty tags are found, they belong to the prior verse.
 		//    Once a begin tag is found, it belongs to the next verse.
-		// If the title has an attribute type of "main" or "chapter"
-		// it belongs to its <div> or <chapter> and is treated as part of its heading
-		// Otherwise if it a title in a chapter before the first the first verse it
-		// is put into the verse as a preverse title.
-
-		if (!inPreVerse && !inBookHeader) {
-			if (inChapterHeader) {
+		if (!inPreVerse && !inBookIntro) {
+			if (inChapterIntro) {
 				// Determine when we are no longer in a chapter heading, but in pre-verse material:
 				// If we see one of the following:
 				// 	a section div
-				// 	a title that is not main or chapter
-				if ((!strcmp(tokenName, "div") && (typeAttr && !strcmp(typeAttr, "section"))) ||
-				    (!strcmp(tokenName, "title") && (!typeAttr || (strcmp(typeAttr, "main") && strcmp(typeAttr, "chapter"))))
-				   ) {
-					// Since we have found the boundary, we need to write out the chapter heading
-					writeEntry(text);
+				// 	a title that is not main, chapter or sub or unclassified (no type attribute)
+				if ((tokenName == "div" && typeAttr == "section") ||
+				    (tokenName == "title" && typeAttr.length() != 0 && typeAttr != "main" && typeAttr != "chapter" && typeAttr != "sub")
+				) {
+					if (debug & DEBUG_TITLE) {
+						cout << "DEBUG(TITLE): " << currentOsisID << ": Done looking for chapter introduction" << endl;
+					}
+
+					if (text.length()) {
+						if (debug & DEBUG_TITLE) {
+							cout << "DEBUG(TITLE): " << currentOsisID << ": CHAPTER INTRO "<< text << endl;
+						}
+
+						// Since we have found the boundary, we need to write out the chapter heading
+						writeEntry(text);
+					}
 					// And we are no longer in the chapter heading
-					inChapterHeader = false;
+					inChapterIntro  = false;
 					// But rather, we are now in pre-verse material
 					inPreVerse      = true;
 				}
@@ -916,18 +913,16 @@ bool handleToken(SWBuf &text, XMLTag token) {
 
 			if (inPreVerse) {
 				char genBuf[200];
-				sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" sID=\"pv%d\"/>", genID++);
+				sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" sID=\"pv%d\"/>", genID);
 				text.append(genBuf);
 			}
 		}
 
-#ifdef DEBUG
 		if (debug & DEBUG_INTERVERSE) {
-			if (!inVerse && !inBookHeader && !inChapterHeader) {
+			if (!inVerse && !inBookIntro && !inChapterIntro) {
 				cout << "DEBUG(INTERVERSE): " << currentOsisID << ": interverse start token " << token << ":" << text.c_str() << endl;
 			}
 		}
-#endif
 
 		return false;
 	} // Done with procesing start and empty tags
@@ -944,14 +939,14 @@ bool handleToken(SWBuf &text, XMLTag token) {
 		if (!token.isEmpty()) {
 			XMLTag topToken = tagStack.top();
 			tagDepth = tagStack.size();
-#ifdef DEBUG
+
 			if (debug & DEBUG_STACK) {
 				cout << "DEBUG(STACK): " << currentOsisID << ": pop(" << tagDepth << ") " << topToken.getName() << endl;
 			}
-#endif
+
 			tagStack.pop();
 
-			if (strcmp(topToken.getName(), tokenName)) {
+			if (tokenName != topToken.getName()) {
 				cout << "FATAL(NESTING): " << currentOsisID << ": Expected " << topToken.getName() << " found " << tokenName << endl;
 //				exit(EXIT_BAD_NESTING);	// (OSK) I'm sure this validity check is a good idea, but there's a but somewhere that's killing the converter here.
 						// So I'm disabling this line. Unvalidated OSIS files shouldn't be run through the converter anyway.
@@ -966,7 +961,9 @@ bool handleToken(SWBuf &text, XMLTag token) {
 		}
 
 		// VERSE and COMMENTARY END
-		if (!strcmp(tokenName, "verse") || (inVerse && !strcmp(tokenName, "div"))) {
+		if ((tokenName == "verse") ||
+		    (tokenName == "div" && eidAttr == sidVerse)
+		) {
 
 			if (tagDepth != verseDepth) {
 				cout << "WARNING(NESTING): verse " << currentOsisID << " is not well formed:(" << verseDepth << "," << tagDepth << ")" << endl;
@@ -979,10 +976,9 @@ bool handleToken(SWBuf &text, XMLTag token) {
 
 
 			// Include the token if it is not a verse
-			if (strcmp(tokenName, "verse")) {
+			if (tokenName != "verse") {
 				text.append(token);
 			}
-#ifdef DEBUG
 			else if (debug & DEBUG_VERSE)
 			{
 				// transform the verse into a milestone
@@ -995,7 +991,6 @@ bool handleToken(SWBuf &text, XMLTag token) {
 				}
 				text.append(t);
 			}
-#endif
 
 			writeEntry(text);
 
@@ -1009,23 +1004,23 @@ bool handleToken(SWBuf &text, XMLTag token) {
 		// Handle WOC quotes.
 		// Note this requires transformBSP to make them into milestones
 		// Otherwise have to manage it here
-		if (!strcmp(tokenName, "q")) {
+		if (tokenName == "q") {
 			XMLTag topToken = quoteStack.top();
-#ifdef DEBUG
+
 			if (debug & DEBUG_QUOTE) {
 				cout << "DEBUG(QUOTE): " << currentOsisID << ": quote pop(" << quoteStack.size() << ") " << topToken << " -- " << token << endl;
 			}
-#endif
+
 			quoteStack.pop();
 
 			// If we have found an end tag for a <q who="Jesus"> then we are done with the WOC
 			// and we need to terminate the <q who="Jesus" marker=""> that was added earlier in the verse.
 			if (token.getAttribute("who") && !strcmp(token.getAttribute("who"), "Jesus")) {
-#ifdef DEBUG
+
 				if (debug & DEBUG_QUOTE) {
 					cout << "DEBUG(QUOTE): " << currentOsisID << ": (" << quoteStack.size() << ") " << topToken << " -- " << token << endl;
 				}
-#endif
+
 				inWOC = false;
 				const char *sID = topToken.getAttribute("sID");
 				const char *eID = token.getAttribute("eID");
@@ -1059,19 +1054,22 @@ bool handleToken(SWBuf &text, XMLTag token) {
 
 		// Look for the end of document, book and chapter
 		// Also for material that goes with last entry
-		if (!inVerse && !inBookHeader && !inChapterHeader) {
+		if (!inVerse && !inBookIntro && !inChapterIntro) {
 			// Is this the end of a chapter.
-			if (tagDepth == chapterDepth && (!strcmp(tokenName, "div") || !strcmp(tokenName, "chapter"))) {
+			if ((tokenName == "chapter") ||
+			    (tokenName == "div" && eidAttr == sidChapter)
+			) {
 				text.append(token);
 				writeEntry(text);
 				inChapter    = false;
+				sidChapter   = "";
 				chapterDepth = 0;
 				verseDepth   = 0;
 				return true;
 			}
 
 			// Is it the end of a book
-			if (tagDepth == bookDepth && (!strcmp(tokenName, "div"))) {
+			if (tokenName == "div" && eidAttr == sidBook) {
 				text.append(token);
 				writeEntry(text);
 				bookDepth    = 0;
@@ -1081,7 +1079,7 @@ bool handleToken(SWBuf &text, XMLTag token) {
 			}
 
 			// Do not include the end of an osis document
-			if (!strcmp(tokenName, "osisText") || !strcmp(tokenName, "osis")) {
+			if (tokenName == "osisText" || tokenName == "osis") {
 				bookDepth    = 0;
 				chapterDepth = 0;
 				verseDepth   = 0;
@@ -1093,21 +1091,19 @@ bool handleToken(SWBuf &text, XMLTag token) {
 			if (!inPreVerse) {
 				text.append(token);
 				writeEntry(text);
-#ifdef DEBUG
+
 				if (debug & DEBUG_INTERVERSE) {
 					cout << "DEBUG(INTERVERSE): " << currentOsisID << ": appending interverse end tag: " << tokenName << "(" << tagDepth << "," << chapterDepth << "," << bookDepth << ")" << endl;
 				}
-#endif
+
 				return true;
 			}
 
-#ifdef DEBUG
 			if (debug & DEBUG_INTERVERSE) {
 				cout << "DEBUG(INTERVERSE): " << currentOsisID << ": interverse end tag: " << tokenName << "(" << tagDepth << "," << chapterDepth << "," << bookDepth << ")" << endl;
 			}
-#endif
-			return false;
 
+			return false;
 		}
 
 		return false;
@@ -1135,18 +1131,18 @@ XMLTag transformBSP(XMLTag t) {
 
 	// Support simplification transformations
 	if (t.isEmpty()) {
-#ifdef DEBUG
+
 		if (debug & DEBUG_XFORM) {
 			cout << "DEBUG(XFORM): " << currentOsisID << ": xform empty " << t << endl;
 		}
-#endif
+
 		return t;
 	}
 
-	const char* tagName = t.getName();
+	SWBuf tagName = t.getName();
 	if (!t.isEndTag()) {
 		// Transform <p> into <div type="paragraph"> and milestone it
-		if (!strcmp(tagName, "p")) {
+		if (tagName == "p") {
 			t.setText("<div type=\"paragraph\" />");
 			sprintf(buf, "gen%d", sID++);
 			t.setAttribute("sID", buf);
@@ -1159,52 +1155,51 @@ XMLTag transformBSP(XMLTag t) {
 		//   abbr	When would this ever cross a boundary?
 		//   seg	as it is used for a divineName hack
 		//   foreign	so that it can be easily italicized
-		else if (!strcmp(tagName, "chapter") ||
-			 !strcmp(tagName, "closer")  ||
-			 !strcmp(tagName, "div")     ||
-			 !strcmp(tagName, "l")       ||
-			 !strcmp(tagName, "lg")      ||
-			 !strcmp(tagName, "q")       ||
-			 !strcmp(tagName, "salute")  ||
-			 !strcmp(tagName, "signed")  ||
-			 !strcmp(tagName, "speech")  ||
-			 !strcmp(tagName, "verse")
-			) {
+		else if (tagName == "chapter" ||
+			 tagName == "closer"  ||
+			 tagName == "div"     ||
+			 tagName == "l"       ||
+			 tagName == "lg"      ||
+			 tagName == "q"       ||
+			 tagName == "salute"  ||
+			 tagName == "signed"  ||
+			 tagName == "speech"  ||
+			 tagName == "verse"
+		) {
 			t.setEmpty(true);
 			sprintf(buf, "gen%d", sID++);
 			t.setAttribute("sID", buf);
 		}
 		bspTagStack.push(t);
-#ifdef DEBUG
+
 		if (debug & DEBUG_XFORM) {
 			cout << "DEBUG(XFORM): " << currentOsisID << ": xform push (" << bspTagStack.size() << ") " << t << " (tagname=" << tagName << ")" << endl;
 			XMLTag topToken = bspTagStack.top();
 			cout << "DEBUG(XFORM): " << currentOsisID << ": xform top(" << bspTagStack.size() << ") " << topToken << endl;
 		}
-#endif
 	}
 	else {
 		XMLTag topToken = bspTagStack.top();
-#ifdef DEBUG
+
 		if (debug & DEBUG_XFORM) {
 			cout << "DEBUG(XFORM): " << currentOsisID << ": xform pop(" << bspTagStack.size() << ") " << topToken << endl;
 		}
-#endif
+
 		bspTagStack.pop();
 
 		// Look for the milestoneable container tags handled above.
-		if (!strcmp(tagName, "chapter") ||
-			 !strcmp(tagName, "closer")  ||
-			 !strcmp(tagName, "div")     ||
-			 !strcmp(tagName, "l")       ||
-			 !strcmp(tagName, "lg")      ||
-			 !strcmp(tagName, "p")       ||
-			 !strcmp(tagName, "q")       ||
-			 !strcmp(tagName, "salute")  ||
-			 !strcmp(tagName, "signed")  ||
-			 !strcmp(tagName, "speech")  ||
-			 !strcmp(tagName, "verse")
-			) {
+		if (tagName == "chapter" ||
+		    tagName == "closer"  ||
+		    tagName == "div"     ||
+		    tagName == "l"       ||
+		    tagName == "lg"      ||
+		    tagName == "p"       ||
+		    tagName == "q"       ||
+		    tagName == "salute"  ||
+		    tagName == "signed"  ||
+		    tagName == "speech"  ||
+		    tagName == "verse"
+		) {
 			// make this a clone of the start tag with sID changed to eID
 			// Note: in the case of </p> the topToken is a <div type="paragraph">
 			t = topToken;
@@ -1261,9 +1256,11 @@ void usage(const char *app, const char *error = 0) {
 
 	if (error) fprintf(stderr, "\n%s: %s\n", app, error);
 
+	fprintf(stderr, "OSIS Bible/commentary module creation tool for The SWORD Project\n");
 	fprintf(stderr, "\nusage: %s <output/path> <osisDoc> [OPTIONS]\n", app);
 	fprintf(stderr, "  <output/path>\t\t an existing folder that the module will be written\n");
-	fprintf(stderr, "  <osisDoc>\t\t path to the validated OSIS document, or '-' to read from standard input\n");
+	fprintf(stderr, "  <osisDoc>\t\t path to the validated OSIS document, or '-' to\n");
+	fprintf(stderr, "\t\t\t\t read from standard input\n");
 	fprintf(stderr, "  -a\t\t\t augment module if exists (default is to create new)\n");
 	fprintf(stderr, "  -z\t\t\t use ZIP compression (default no compression)\n");
 	fprintf(stderr, "  -Z\t\t\t use LZSS compression (default no compression)\n");
@@ -1275,24 +1272,24 @@ void usage(const char *app, const char *error = 0) {
 	fprintf(stderr, "\t\t\t\t (default is to convert to UTF-8, if needed,\n");
 	fprintf(stderr, "\t\t\t\t  and then normalize to NFC)\n");
 	fprintf(stderr, "\t\t\t\t Note: UTF-8 texts should be normalized to NFC.\n");
-	fprintf(stderr, "  -s <2|4>\t\t max text size per entry (default is 2).\n");
-	fprintf(stderr, "\t\t\t\t Note: useful for commentaries with very large entries\n");
-	fprintf(stderr, "\t\t\t\t       in uncompressed modules (default is 65535 bytes)\n");
+	fprintf(stderr, "  -s <2|4>\t\t bytes used to store entry size (default is 2).\n");
+	fprintf(stderr, "\t\t\t\t Note: useful for commentaries with very large\n");
+	fprintf(stderr, "\t\t\t\t entries in uncompressed modules\n");
+	fprintf(stderr, "\t\t\t\t (2 bytes to store size equal 65535 characters)\n");
 	fprintf(stderr, "  -v <v11n>\t\t specify a versification scheme to use (default is KJV)\n");
 	fprintf(stderr, "\t\t\t\t Note: The following are valid values for v11n:\n");
 	VerseMgr *vmgr = VerseMgr::getSystemVerseMgr();
 	StringList av11n = vmgr->getVersificationSystems();
 	for (StringList::iterator loop = av11n.begin(); loop != av11n.end(); loop++) {
 		fprintf(stderr, "\t\t\t\t\t%s\n", (*loop).c_str());
-        }
-#ifdef DEBUG
+	}
 	fprintf(stderr, "  -d <flags>\t\t turn on debugging (default is 0)\n");
 	fprintf(stderr, "\t\t\t\t Note: This flag may change in the future.\n");
 	fprintf(stderr, "\t\t\t\t Flags: The following are valid values:\n");
 	fprintf(stderr, "\t\t\t\t\t0   - no debugging\n");
 	fprintf(stderr, "\t\t\t\t\t1   - writes to module, very verbose\n");
 	fprintf(stderr, "\t\t\t\t\t2   - verse start and end\n");
-	fprintf(stderr, "\t\t\t\t\t4   - quotes, especially Words of Christ (WOC)\n");
+	fprintf(stderr, "\t\t\t\t\t4   - quotes, esp. Words of Christ\n");
 	fprintf(stderr, "\t\t\t\t\t8   - titles\n");
 	fprintf(stderr, "\t\t\t\t\t16  - inter-verse material\n");
 	fprintf(stderr, "\t\t\t\t\t32  - BSP to BCV transformations\n");
@@ -1300,8 +1297,8 @@ void usage(const char *app, const char *error = 0) {
 	fprintf(stderr, "\t\t\t\t\t128 - parsing of osisID and osisRef\n");
 	fprintf(stderr, "\t\t\t\t\t256 - internal stack\n");
 	fprintf(stderr, "\t\t\t\t\t512 - miscellaneous\n");
-	fprintf(stderr, "\t\t\t\t This flag can be used more than once.\n");
-#endif
+	fprintf(stderr, "\t\t\t\t This argument can be used more than once. (Or\n");
+	fprintf(stderr, "\t\t\t\t the flags may be added together.)\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "See http://www.crosswire.org/wiki/osis2mod for more details.\n");
 	fprintf(stderr, "\n");
@@ -1397,7 +1394,7 @@ void processOSIS(istream& infile) {
 
 int main(int argc, char **argv) {
 
-	fprintf(stderr, "You are running osis2mod: $Rev: 2400 $\n");
+	fprintf(stderr, "You are running osis2mod: $Rev: 2478 $\n");
 
 	// Let's test our command line arguments
 	if (argc < 3) {
@@ -1450,32 +1447,34 @@ int main(int argc, char **argv) {
 		}
 		else if (!strcmp(argv[i], "-s")) {
 			if (compType.size()) usage(*argv, "Cannot specify -s and -z or -Z");
-                        if (i+1 < argc) {
-                                entrySize = atoi(argv[++i]);
-                                if (entrySize == 2 || entrySize == 4) {
-                                        continue;
-                                }
-                        }
-                        usage(*argv, "-s requires one of <2|4>");
+			if (i+1 < argc) {
+				entrySize = atoi(argv[++i]);
+				if (entrySize == 2 || entrySize == 4) {
+					continue;
+				}
+			}
+			usage(*argv, "-s requires one of <2|4>");
 		}
 		else if (!strcmp(argv[i], "-C")) {
 			isCommentary = true;
 		}
-#ifdef DEBUG
 		else if (!strcmp(argv[i], "-d")) {
 			if (i+1 < argc) debug |= atoi(argv[++i]);
 			else usage(*argv, "-d requires <flags>");
 		}
-#endif
 		else usage(*argv, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
 	}
 
-        if (compType == "ZIP") {
-                compressor = new ZipCompress();
-        }
-        else if (compType = "LZSS") {
-                compressor = new LZSSCompress();
-        }
+	if (compType == "ZIP") {
+#ifndef EXCLUDEZLIB
+		compressor = new ZipCompress();
+#else
+		usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library");
+#endif
+	}
+	else if (compType == "LZSS") {
+		compressor = new LZSSCompress();
+	}
 
 #ifndef _ICU_
 	if (normalize) {
@@ -1484,11 +1483,9 @@ int main(int argc, char **argv) {
 	}
 #endif
 
-#ifdef DEBUG
 	if (debug & DEBUG_OTHER) {
 		cout << "DEBUG(ARGS):\n\tpath: " << path << "\n\tosisDoc: " << osisDoc << "\n\tcreate: " << append << "\n\tcompressType: " << compType << "\n\tblockType: " << iType << "\n\tcipherKey: " << cipherKey.c_str() << "\n\tnormalize: " << normalize << endl;
 	}
-#endif
 
 	if (!append) {	// == 0 then create module
 	// Try to initialize a default set of datafiles and indicies at our
@@ -1529,7 +1526,7 @@ int main(int argc, char **argv) {
 				FMT_UNKNOWN,	// markup
 				0,		// lang
 				v11n		// versification
-                       );
+		       );
 	}
 	else if (entrySize == 4) {
 		// Create a raw text module allowing very large entries
diff --git a/utilities/stepdump.cpp b/utilities/stepdump.cpp
index 8d136ac..4838694 100644
--- a/utilities/stepdump.cpp
+++ b/utilities/stepdump.cpp
@@ -15,10 +15,12 @@
  *
  */
 
-#include <iostream>
-#include <string>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <stdio.h>
+
+#include <iostream>
+#include <string>
 
 #ifndef __GNUC__
 #include <io.h>
diff --git a/utilities/tei2mod.cpp b/utilities/tei2mod.cpp
index e8c6e95..b42528d 100644
--- a/utilities/tei2mod.cpp
+++ b/utilities/tei2mod.cpp
@@ -332,7 +332,7 @@ void usage(const char *app, const char *error = 0) {
 			
 	if (error) fprintf(stderr, "\n%s: %s\n", app, error);
 		
-	fprintf(stderr, "TEI Lexicon/Dictionary/Daily Devotional/Glossary module creation tool for the SWORD Project\n");
+	fprintf(stderr, "TEI Lexicon/Dictionary/Daily Devotional/Glossary module creation tool for\n\tThe SWORD Project\n");
 	fprintf(stderr, "\nusage: %s <output/path> <teiDoc> [OPTIONS]\n", app);
 	fprintf(stderr, "  -z\t\t\t use ZIP compression (default no compression)\n");
 	fprintf(stderr, "  -Z\t\t\t use LZSS compression (default no compression)\n");
@@ -340,9 +340,10 @@ void usage(const char *app, const char *error = 0) {
 	fprintf(stderr, "  -c <cipher_key>\t encipher module using supplied key\n");
 	fprintf(stderr, "\t\t\t\t (default no enciphering)\n");
         fprintf(stderr, "  -N\t\t\t Do not convert UTF-8 or normalize UTF-8 to NFC\n");
-        fprintf(stderr, "\t\t\t\t (default is to convert to UTF-8, if needed, and then normalize to NFC");
-        fprintf(stderr, "\t\t\t\t Note: all UTF-8 texts should be normalized to NFC\n");
-	fprintf(stderr, "-z, -Z, and -s are mutually exclusive\n");
+        fprintf(stderr, "\t\t\t\t (default is to convert to UTF-8, if needed,\n");
+        fprintf(stderr, "\t\t\t\t  and then normalize to NFC. Note: all UTF-8\n");
+	fprintf(stderr, "\t\t\t\t  texts should be normalized to NFC.)\n");
+	fprintf(stderr, "\n\tThe options -z, -Z, and -s are mutually exclusive.\n");
 	exit(-1);
 }
 
@@ -418,7 +419,11 @@ int main(int argc, char **argv) {
 #endif
 
 	if (compType == "ZIP") {
+#ifndef EXCLUDEZLIB
 		compressor = new ZipCompress();
+#else
+		usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library");
+#endif
 	}
 	else if (compType = "LZSS") {
 		compressor = new LZSSCompress();
diff --git a/utilities/vcppmake/genbookutil.vcproj b/utilities/vcppmake/genbookutil.vcproj
new file mode 100644
index 0000000..8be2933
--- /dev/null
+++ b/utilities/vcppmake/genbookutil.vcproj
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="genbookutil"

+	ProjectGUID="{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}"

+	RootNamespace="genbookutil"

+	TargetFrameworkVersion="196613"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug with ICU|Win32"

+			OutputDirectory="$(SolutionDir)Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"

+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib icuuc.lib icuin.lib icudt.lib"

+				OutputFile="Debug\$(ProjectName).exe"

+				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICUDebug"

+				GenerateDebugInformation="true"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release with ICU|Win32"

+			OutputDirectory="$(SolutionDir)Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="1"

+			CharacterSet="2"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"

+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib icuuc.lib icuin.lib icudt.lib"

+				OutputFile="Release\$(ProjectName).exe"

+				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICURelease"

+				GenerateDebugInformation="true"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{}"

+			>

+			<File

+				RelativePath="..\genbookutil.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{}"

+			>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{}"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/utilities/vcppmake/modwrite.vcproj b/utilities/vcppmake/modwrite.vcproj
new file mode 100644
index 0000000..1e72106
--- /dev/null
+++ b/utilities/vcppmake/modwrite.vcproj
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="modwrite"

+	ProjectGUID="{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}"

+	RootNamespace="modwrite"

+	TargetFrameworkVersion="196613"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug with ICU|Win32"

+			OutputDirectory="$(SolutionDir)Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"

+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib icuuc.lib icuin.lib icudt.lib"

+				OutputFile="Debug\$(ProjectName).exe"

+				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICUDebug"

+				GenerateDebugInformation="true"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release with ICU|Win32"

+			OutputDirectory="$(SolutionDir)Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="1"

+			CharacterSet="2"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"

+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib icuuc.lib icuin.lib icudt.lib"

+				OutputFile="Release\$(ProjectName).exe"

+				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICURelease"

+				GenerateDebugInformation="true"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{}"

+			>

+			<File

+				RelativePath="..\modwrite.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{}"

+			>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{}"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/utilities/vcppmake/utilities.sln b/utilities/vcppmake/utilities.sln
index 3875055..20d97b2 100644
--- a/utilities/vcppmake/utilities.sln
+++ b/utilities/vcppmake/utilities.sln
@@ -4,48 +4,129 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\lib\vcppmake\vc8\libsword.vcproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osis2mod", "osis2mod.vcproj", "{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addgb", "addgb.vcproj", "{76895767-61D0-41E6-B92D-FD541BB26D32}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addld", "addld.vcproj", "{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addvs", "addvs.vcproj", "{CFF1021E-B878-481A-851B-2B226701D525}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cipherraw", "cipherraw.vcproj", "{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emptyvss", "emptyvss.vcproj", "{A55BEE98-25BB-463D-9016-14CA4567DFBF}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2gbs", "imp2gbs.vcproj", "{2066EC0D-98CC-43E7-8405-5156AF111B38}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2ld", "imp2ld.vcproj", "{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2vs", "imp2vs.vcproj", "{5637456D-5B83-4C12-A129-708FC8CF0B33}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installmgr", "installmgr.vcproj", "{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkfastmod", "mkfastmod.vcproj", "{DB592F77-25DC-4005-BD49-6D0E50303844}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2imp", "mod2imp.vcproj", "{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2osis", "mod2osis.vcproj", "{B5D19969-5285-4B0E-B798-496A0B8DCA61}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2vpl", "mod2vpl.vcproj", "{0C43604F-08D6-490C-BDFD-1B6CACB59740}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2zmod", "mod2zmod.vcproj", "{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "step2vpl", "step2vpl.vcproj", "{43B53430-3C91-4A11-8A1F-5873AEEE0926}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stepdump", "stepdump.vcproj", "{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tei2mod", "tei2mod.vcproj", "{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treeidxutil", "treeidxutil.vcproj", "{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisref", "vs2osisref.vcproj", "{DFDB8804-5D6C-448F-A935-DD85629E0554}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisreftxt", "vs2osisreftxt.vcproj", "{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2gbs", "xml2gbs.vcproj", "{87116D0C-E498-4193-9F2D-301A8771B77D}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genbookutil", "genbookutil.vcproj", "{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modwrite", "modwrite.vcproj", "{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpl2mod", "vpl2mod.vcproj", "{7192CF83-B08C-4387-A869-FD1970167115}"

+	ProjectSection(ProjectDependencies) = postProject

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -239,6 +320,30 @@ Global
 		{87116D0C-E498-4193-9F2D-301A8771B77D}.Release with ICU|Win32.Build.0 = Release with ICU|Win32

 		{87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.ActiveCfg = Release with ICU|Win32

 		{87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.Build.0 = Release with ICU|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.ActiveCfg = Debug with ICU|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.Build.0 = Debug with ICU|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release with ICU|Win32.Build.0 = Release with ICU|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.ActiveCfg = Release with ICU|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.Build.0 = Release with ICU|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.ActiveCfg = Debug with ICU|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.Build.0 = Debug with ICU|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release with ICU|Win32.Build.0 = Release with ICU|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.ActiveCfg = Release with ICU|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.Build.0 = Release with ICU|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.ActiveCfg = Debug with ICU|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.Build.0 = Debug with ICU|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Release with ICU|Win32.Build.0 = Release with ICU|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.ActiveCfg = Release with ICU|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.Build.0 = Release with ICU|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/utilities/vcppmake/vpl2mod.vcproj b/utilities/vcppmake/vpl2mod.vcproj
new file mode 100644
index 0000000..627d89d
--- /dev/null
+++ b/utilities/vcppmake/vpl2mod.vcproj
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="vpl2mod"

+	ProjectGUID="{7192CF83-B08C-4387-A869-FD1970167115}"

+	RootNamespace="vpl2mod"

+	TargetFrameworkVersion="196613"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug with ICU|Win32"

+			OutputDirectory="$(SolutionDir)Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"

+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib icuuc.lib icuin.lib icudt.lib"

+				OutputFile="Debug\$(ProjectName).exe"

+				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICUDebug"

+				GenerateDebugInformation="true"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release with ICU|Win32"

+			OutputDirectory="$(SolutionDir)Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="1"

+			CharacterSet="2"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"

+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib icuuc.lib icuin.lib icudt.lib"

+				OutputFile="Release\$(ProjectName).exe"

+				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICURelease"

+				GenerateDebugInformation="true"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{}"

+			>

+			<File

+				RelativePath="..\vpl2mod.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{}"

+			>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{}"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>