diff --git a/100_core/src/gplx/Bry_bfr.java b/100_core/src/gplx/Bry_bfr.java
index 253a1c93a..9d139afee 100644
--- a/100_core/src/gplx/Bry_bfr.java
+++ b/100_core/src/gplx/Bry_bfr.java
@@ -542,6 +542,11 @@ public class Bry_bfr {
 		if (reset > 0) Reset_if_gt(reset);
 		return rv;
 	}
+	public byte[] To_bry_and_clear_and_rls() {
+		byte[] rv = To_bry_and_clear();
+		this.Mkr_rls();
+		return rv;
+	}
 	public String To_str()								{return String_.new_u8(To_bry());}
 	public String To_str_by_pos(int bgn, int end)		{return String_.new_u8(To_bry(), bgn, end);}
 	public String To_str_and_clear()					{return String_.new_u8(To_bry_and_clear());}
diff --git a/100_core/src/gplx/Gfo_log_.java b/100_core/src/gplx/Gfo_log_.java
index 2107c06fa..6a9f654a1 100644
--- a/100_core/src/gplx/Gfo_log_.java
+++ b/100_core/src/gplx/Gfo_log_.java
@@ -30,6 +30,7 @@ public class Gfo_log_ {
 	}
 	public static Gfo_log New_file(Io_url dir) {
 		Io_url url = dir.GenSubFil(DateAdp_.Now().XtoStr_fmt(File__fmt) + File__ext);
+		Gfo_log__file.Delete_old_files(dir, Gfo_log_.Instance);
 		return new Gfo_log__file(url, new Gfo_log_itm_wtr__csv());
 	}
 }
diff --git a/100_core/src/gplx/Int_.java b/100_core/src/gplx/Int_.java
index c32a554c4..dd7887337 100644
--- a/100_core/src/gplx/Int_.java
+++ b/100_core/src/gplx/Int_.java
@@ -42,6 +42,16 @@ public class Int_ implements Gfo_invk {
 		for (int i = 0; i < src_len; ++i)
 			trg[i] = src[i];
 	}
+	public static String Ary_concat(String spr, int... ary) {
+		Bry_bfr bfr = Bry_bfr_.New();
+		int len = ary.length;
+		for (int i = 0; i < len; ++i) {
+			if (i != 0) bfr.Add_str_u8(spr);
+			int itm = ary[i];
+			bfr.Add_int_variable(itm);
+		}
+		return bfr.To_str_and_clear();
+	}
 	public static int[] AryRng(int bgn, int end) {
 		int len = end - bgn + 1;
 		int[] rv = new int[len];
diff --git a/100_core/src/gplx/core/btries/Btrie_rv.java b/100_core/src/gplx/core/btries/Btrie_rv.java
new file mode 100644
index 000000000..7aafde32f
--- /dev/null
+++ b/100_core/src/gplx/core/btries/Btrie_rv.java
@@ -0,0 +1,31 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.btries; import gplx.*; import gplx.core.*;
+import gplx.core.threads.poolables.*;
+public class Btrie_rv implements Gfo_poolable_itm {
+	public Object Obj() {return obj;} private Object obj;
+	public int Pos() {return pos;} private int pos;
+	public Btrie_rv Init(int pos, Object obj) {
+		this.obj = obj;
+		this.pos = pos;
+		return this;
+	}
+
+	public void				Pool__rls	() {pool_mgr.Rls_fast(pool_idx);} private Gfo_poolable_mgr pool_mgr; private int pool_idx;
+	public Gfo_poolable_itm	Pool__make	(Gfo_poolable_mgr mgr, int idx, Object[] args) {Btrie_rv rv = new Btrie_rv(); rv.pool_mgr = mgr; rv.pool_idx = idx; return rv;}
+}
diff --git a/100_core/src/gplx/core/btries/Btrie_slim_itm.java b/100_core/src/gplx/core/btries/Btrie_slim_itm.java
index 3cfa21922..69409d628 100644
--- a/100_core/src/gplx/core/btries/Btrie_slim_itm.java
+++ b/100_core/src/gplx/core/btries/Btrie_slim_itm.java
@@ -95,7 +95,7 @@ public class Btrie_slim_itm {
 		}
 		if (found) --ary_len;
 	}
-	public static final Btrie_slim_itm[] Ary_empty = new Btrie_slim_itm[0]; int ary_len = 0, ary_max = 0;
+	public static final    Btrie_slim_itm[] Ary_empty = new Btrie_slim_itm[0]; int ary_len = 0, ary_max = 0;
 }
 class ByteHashItm_sorter {// quicksort
 	Btrie_slim_itm[] ary; int ary_len;
@@ -126,5 +126,5 @@ class ByteHashItm_sorter {// quicksort
 		if (lo < j) Sort_recurse(lo, j);
 		if (i < hi) Sort_recurse(i, hi);
 	}
-	public static final ByteHashItm_sorter Instance = new ByteHashItm_sorter(); ByteHashItm_sorter() {}
+	public static final    ByteHashItm_sorter Instance = new ByteHashItm_sorter(); ByteHashItm_sorter() {}
 }
diff --git a/100_core/src/gplx/core/btries/Btrie_slim_mgr.java b/100_core/src/gplx/core/btries/Btrie_slim_mgr.java
index 7f5183972..d7bb1c9ac 100644
--- a/100_core/src/gplx/core/btries/Btrie_slim_mgr.java
+++ b/100_core/src/gplx/core/btries/Btrie_slim_mgr.java
@@ -16,11 +16,35 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.btries; import gplx.*; import gplx.core.*;
-import gplx.core.primitives.*;
+import gplx.core.primitives.*; import gplx.core.threads.poolables.*;
 public class Btrie_slim_mgr implements Btrie_mgr {
+	private static Gfo_poolable_mgr pool_rv = Gfo_poolable_mgr.New_rlsable(new Btrie_rv(), Object_.Ary_empty, 0, 1024);
 	Btrie_slim_mgr(boolean case_match) {root = new Btrie_slim_itm(Byte_.Zero, null, !case_match);}	private Btrie_slim_itm root;
 	public int Count() {return count;} private int count;
 	public int Match_pos() {return match_pos;} private int match_pos;
+
+	public Btrie_rv Match_at(byte[] src, int bgn, int end) {return bgn < end  ? Match_at_w_b0(src[bgn], src, bgn, end) : null;} // handle out of bounds gracefully; EX: Match_bgn("abc", 3, 3) should return null not fail
+	public Btrie_rv Match_at_w_b0(byte b, byte[] src, int bgn_pos, int src_end) {
+		Object rv_obj = null; 
+		int rv_pos = bgn_pos;
+		int cur_pos = bgn_pos;
+		Btrie_slim_itm cur = root;
+		while (true) {
+			Btrie_slim_itm nxt = cur.Ary_find(b);
+			if (nxt == null) 
+				return ((Btrie_rv)pool_rv.Get_safe()).Init(cur_pos, rv_obj);			// nxt does not hav b; return rv_obj;
+			++cur_pos;
+			if (nxt.Ary_is_empty()) {
+				return ((Btrie_rv)pool_rv.Get_safe()).Init(cur_pos, nxt.Val());			// nxt is leaf; return nxt.Val() (which should be non-null)
+			}
+			Object nxt_val = nxt.Val();
+			if (nxt_val != null) {rv_pos = cur_pos; rv_obj = nxt_val;}					// nxt is node; cache rv_obj (in case of false match)
+			if (cur_pos == src_end)
+				return ((Btrie_rv)pool_rv.Get_safe()).Init(rv_pos, rv_obj);				// increment cur_pos and exit if src_end
+			b = src[cur_pos];
+			cur = nxt;
+		}
+	}
 	public Object Match_exact(byte[] src) {return src == null ? null : Match_exact(src, 0, src.length);}
 	public Object Match_exact(byte[] src, int bgn_pos, int end_pos) {
 		if (bgn_pos == end_pos) return null;	// NOTE:handle empty String; DATE:2016-04-21
diff --git a/100_core/src/gplx/core/ios/IoEngine_system.java b/100_core/src/gplx/core/ios/IoEngine_system.java
index e734dcdf1..84b2aa612 100644
--- a/100_core/src/gplx/core/ios/IoEngine_system.java
+++ b/100_core/src/gplx/core/ios/IoEngine_system.java
@@ -98,7 +98,7 @@ public class IoEngine_system extends IoEngine_base {
 		}
 		return Load_from_stream_as_str(stream, url_str);
 	}
-	@SuppressWarnings("resource") public static String Load_from_stream_as_str(InputStream stream, String url_str) {
+	public static String Load_from_stream_as_str(InputStream stream, String url_str) {
 		InputStreamReader reader = null;
 		try 	{reader = new InputStreamReader(stream, IoEngineArgs.Instance.LoadFilStr_Encoding);}
 		catch 	(UnsupportedEncodingException e) {
@@ -131,7 +131,7 @@ public class IoEngine_system extends IoEngine_base {
 	    Closeable_close(reader, url_str, false);
 		return sw.toString();
 	}
-	@SuppressWarnings("resource") public static byte[] Load_from_stream_as_bry(InputStream stream, String url_str) {
+	public static byte[] Load_from_stream_as_bry(InputStream stream, String url_str) {
 		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 		byte[] data = new byte[4096];
 		int read = 0;
@@ -239,7 +239,6 @@ public class IoEngine_system extends IoEngine_base {
 		if (!ExistsFil_api(url)) SaveFilText_api(IoEngine_xrg_saveFilStr.new_(url, ""));
 		return IoStream_base.new_(url, args.Mode());
 	}
-	@SuppressWarnings("resource")
 	@Override public void CopyFil(IoEngine_xrg_xferFil args) {
 		// TODO:JAVA6 hidden property ignored; 1.6 does not allow OS-independent way of setting isHidden (wnt only possible through jni)
 		boolean overwrite = args.Overwrite();
diff --git a/100_core/src/gplx/core/ios/streams/Io_stream_wtr_.java b/100_core/src/gplx/core/ios/streams/Io_stream_wtr_.java
index 63aab4300..cfda588b3 100644
--- a/100_core/src/gplx/core/ios/streams/Io_stream_wtr_.java
+++ b/100_core/src/gplx/core/ios/streams/Io_stream_wtr_.java
@@ -77,7 +77,7 @@ abstract class Io_stream_wtr_base implements Io_stream_wtr {
 	public Io_url Url() {return url;} public Io_stream_wtr Url_(Io_url v) {url = v; trg_bfr = null; return this;} Io_url url;
 	public void Trg_bfr_(Bry_bfr v) {trg_bfr = v;} Bry_bfr trg_bfr; java.io.ByteArrayOutputStream mem_stream;
 	public byte[] To_ary_and_clear() {return trg_bfr.To_bry_and_clear();}
-	@SuppressWarnings("resource") public Io_stream_wtr Open() {
+	public Io_stream_wtr Open() {
 		java.io.OutputStream bry_stream = null;
 		if (trg_bfr == null) {
 			if (!Io_mgr.Instance.ExistsFil(url)) Io_mgr.Instance.SaveFilStr(url, "");			
@@ -130,7 +130,7 @@ class Io_stream_wtr_zip implements Io_stream_wtr {
 	@Override public byte Tid() {return Io_stream_.Tid_zip;}
 	public Io_url Url() {return url;} public Io_stream_wtr Url_(Io_url v) {url = v; trg_bfr = null; return this;} private Io_url url = Io_url_.Empty;
 	public void Trg_bfr_(Bry_bfr v) {trg_bfr = v;} private Bry_bfr trg_bfr; private java.io.ByteArrayOutputStream mem_stream;
-	@SuppressWarnings("resource") // rely on zip_stream to close bry_stream 
+	// rely on zip_stream to close bry_stream 
 	public Io_stream_wtr Open() {
 		java.io.OutputStream bry_stream;
 		if (trg_bfr == null) {
diff --git a/100_core/src/gplx/core/ios/zips/Io_zip_compress_cmd__jre.java b/100_core/src/gplx/core/ios/zips/Io_zip_compress_cmd__jre.java
index a3ded866b..72a05d6be 100644
--- a/100_core/src/gplx/core/ios/zips/Io_zip_compress_cmd__jre.java
+++ b/100_core/src/gplx/core/ios/zips/Io_zip_compress_cmd__jre.java
@@ -41,13 +41,22 @@ public class Io_zip_compress_cmd__jre {
 			while (true) {	// loop over bytes
 				int read_in_raw = -1;
 				try {read_in_raw = src_stream.read(buffer);}
-				catch (Exception e) {throw Err_.new_exc(e, "io", "src read failed", "url", src_url.Raw());}
+				catch (Exception e) {
+					try {src_stream.close();}
+					catch (IOException e1) {}
+					throw Err_.new_exc(e, "io", "src read failed", "url", src_url.Raw());
+				}
 				if (read_in_raw < 1) break;
 				try {trg_stream.write(buffer, 0, read_in_raw);}
-				catch (Exception e) {throw Err_.new_exc(e, "io", "trg write failed", "url", trg_url.Raw());}
+				catch (Exception e) {
+					try {src_stream.close();}
+					catch (IOException e1) {}
+					throw Err_.new_exc(e, "io", "trg write failed", "url", trg_url.Raw());
+				}
 			}
 			try {
 				trg_stream.closeEntry();
+				trg_stream.close();
 				src_stream.close();
 			}
 			catch (Exception e) {throw Err_.new_exc(e, "io", "trg close entry failed", "url", src_url.Raw());}
diff --git a/100_core/src/gplx/core/logs/Gfo_log__file.java b/100_core/src/gplx/core/logs/Gfo_log__file.java
index 6aaf57e88..8720d89fd 100644
--- a/100_core/src/gplx/core/logs/Gfo_log__file.java
+++ b/100_core/src/gplx/core/logs/Gfo_log__file.java
@@ -48,4 +48,16 @@ public class Gfo_log__file extends Gfo_log__base {
 		Io_mgr.Instance.AppendFilByt(url, bry);
 		itms.Clear();
 	}
+	public static void Delete_old_files(Io_url dir, Gfo_log log) {
+		Io_url[] fils = Io_mgr.Instance.QueryDir_fils(dir);
+		int fils_len = fils.length;
+		if (fils_len < 9) return;	// exit if less than 8 files
+		int cutoff = fils_len - 8;	
+		Array_.Sort(fils);			// sort by path
+		for (int i = 0; i < cutoff; ++i) {
+			Io_url fil = fils[i];
+			log.Info("deleting old log file", "file", fil.Raw());
+			Io_mgr.Instance.DeleteFil(fil);
+		}
+	}
 }
diff --git a/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_log.java b/100_core/src/gplx/core/memorys/Gfo_memory_itm.java
similarity index 58%
rename from 400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_log.java
rename to 100_core/src/gplx/core/memorys/Gfo_memory_itm.java
index 3eba0ebb7..6d0b83df5 100644
--- a/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_log.java
+++ b/100_core/src/gplx/core/memorys/Gfo_memory_itm.java
@@ -15,13 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa.parsers.apos; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
-import gplx.core.log_msgs.*;
-public class Xop_apos_log {
-	private static final Gfo_msg_grp owner = Gfo_msg_grp_.new_(Xoa_app_.Nde, "apos");
-	public static final Gfo_msg_itm
-		  Bold_converted_to_ital			= Gfo_msg_itm_.new_note_(owner, "Bold_converted_to_ital")
-		, Dangling_apos						= Gfo_msg_itm_.new_note_(owner, "Dangling_apos")
-		, Multiple_apos						= Gfo_msg_itm_.new_note_(owner, "Multiple_apos")
-		;
+package gplx.core.memorys; import gplx.*; import gplx.core.*;
+public interface Gfo_memory_itm {
+	void Rls_mem();
 }
diff --git a/100_core/src/gplx/core/memorys/Gfo_memory_mgr.java b/100_core/src/gplx/core/memorys/Gfo_memory_mgr.java
new file mode 100644
index 000000000..cd6ddda22
--- /dev/null
+++ b/100_core/src/gplx/core/memorys/Gfo_memory_mgr.java
@@ -0,0 +1,33 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.memorys; import gplx.*; import gplx.core.*;
+public class Gfo_memory_mgr {
+	private final    List_adp list = List_adp_.New();
+	public void Reg_safe(Gfo_memory_itm itm) {synchronized (list) {Reg_fast(itm);}}
+	public void Reg_fast(Gfo_memory_itm itm) {list.Add(itm);}
+	public void Rls_safe() {synchronized (list) {Rls_fast();}}
+	public void Rls_fast() {
+		int len = list.Len();
+		for (int i = 0; i < len; ++i) {
+			Gfo_memory_itm itm = (Gfo_memory_itm)list.Get_at(i);
+			itm.Rls_mem();
+		}
+		list.Clear();
+	}
+	public static final    Gfo_memory_mgr Instance = new Gfo_memory_mgr(); Gfo_memory_mgr() {}
+}
diff --git a/100_core/src/gplx/core/progs/Gfo_prog_ui_.java b/100_core/src/gplx/core/progs/Gfo_prog_ui_.java
index 196d4a54d..91836d81c 100644
--- a/100_core/src/gplx/core/progs/Gfo_prog_ui_.java
+++ b/100_core/src/gplx/core/progs/Gfo_prog_ui_.java
@@ -24,7 +24,7 @@ public class Gfo_prog_ui_ {
 	, Status__done			=  4
 	, Status__fail			=  8
 	, Status__suspended		= 16
-	, Status__runnable		= Status__init | Status__suspended
+	, Status__runnable		= Status__init | Status__suspended | Status__fail
 	;
 }
 class Gfo_prog_ui__noop implements Gfo_prog_ui {
diff --git a/100_core/src/gplx/core/tests/Gftest.java b/100_core/src/gplx/core/tests/Gftest.java
index d4eee1235..130b85ae8 100644
--- a/100_core/src/gplx/core/tests/Gftest.java
+++ b/100_core/src/gplx/core/tests/Gftest.java
@@ -19,8 +19,9 @@ package gplx.core.tests; import gplx.*; import gplx.core.*;
 import gplx.core.brys.*;
 public class Gftest {
 	private static final    Bry_bfr bfr = Bry_bfr_.New();
-	public static void Eq__ary(long[] expd, long[] actl, String msg_fmt, Object... msg_args) {Eq__array(Type_adp_.Tid__long, expd, actl, msg_fmt, msg_args);}
-	public static void Eq__ary__lines(String expd, String actl, String msg_fmt, Object... msg_args) {Eq__array(Type_adp_.Tid__bry, Bry_split_.Split_lines(Bry_.new_u8(expd)), Bry_split_.Split_lines(Bry_.new_u8(actl)), msg_fmt, msg_args);}
+	public static void Eq__ary(int[] expd, int[] actl, String msg_fmt, Object... msg_args)			{Eq__array(Type_adp_.Tid__int, expd, actl, msg_fmt, msg_args);}
+	public static void Eq__ary(long[] expd, long[] actl, String msg_fmt, Object... msg_args)			{Eq__array(Type_adp_.Tid__long, expd, actl, msg_fmt, msg_args);}
+	public static void Eq__ary__lines(String expd, String actl, String msg_fmt, Object... msg_args)	{Eq__array(Type_adp_.Tid__bry, Bry_split_.Split_lines(Bry_.new_u8(expd)), Bry_split_.Split_lines(Bry_.new_u8(actl)), msg_fmt, msg_args);}
 	public static void Eq__ary(String[] expd, String[] actl)												{Eq__array(Type_adp_.Tid__bry, Bry_.Ary(expd), Bry_.Ary(actl), "no_msg");}
 	public static void Eq__ary(String[] expd, String[] actl, String msg_fmt, Object... msg_args)		{Eq__array(Type_adp_.Tid__bry, Bry_.Ary(expd), Bry_.Ary(actl), msg_fmt, msg_args);}
 	public static void Eq__ary(String[] expd, byte[][] actl, String msg_fmt, Object... msg_args)		{Eq__array(Type_adp_.Tid__bry, Bry_.Ary(expd), actl, msg_fmt, msg_args);}
@@ -37,6 +38,20 @@ public class Gftest {
 			throw Err_.new_wo_type(bfr.To_str_and_clear());
 		}
 	}
+	public static void Eq__null(boolean expd, Object actl) {Eq__null(expd, actl, null);}
+	public static void Eq__null(boolean expd, Object actl, String msg_fmt, Object... msg_args) {
+		if (	expd	&& actl == null
+			||	!expd	&& actl != null
+			) return;
+		Write_fail_head(bfr, msg_fmt, msg_args);
+		String expd_str = expd ? "null" : "not null";
+		String actl_str = actl == null ? "null" : "not null";
+		bfr.Add_str_a7("expd: ").Add_str_a7(expd_str).Add_byte_nl();
+		bfr.Add_str_a7("actl: ").Add_str_a7(actl_str).Add_byte_nl();
+		bfr.Add(Bry__line_end);
+		throw Err_.new_wo_type(bfr.To_str_and_clear());
+	}
+	public static void Eq__str(String expd, byte[] actl, String msg_fmt, Object... msg_args) {Eq__str(expd, String_.new_u8(actl), msg_fmt, msg_args);}
 	public static void Eq__str(String expd, byte[] actl) {Eq__str(expd, String_.new_u8(actl), null);}
 	public static void Eq__str(String expd, String actl) {Eq__str(expd, actl, null);}
 	public static void Eq__str(String expd, String actl, String msg_fmt, Object... msg_args) {
@@ -65,6 +80,24 @@ public class Gftest {
 		bfr.Add(Bry__line_end);
 		throw Err_.new_wo_type(bfr.To_str_and_clear());
 	}
+	public static void Eq__byte(byte expd, byte actl) {Eq__byte(expd, actl, null);}
+	public static void Eq__byte(byte expd, byte actl, String msg_fmt, Object... msg_args) {
+		if (expd == actl) return;
+		Write_fail_head(bfr, msg_fmt, msg_args);
+		bfr.Add_str_a7("expd: ").Add_byte_as_a7(expd).Add_byte_nl();
+		bfr.Add_str_a7("actl: ").Add_byte_as_a7(actl).Add_byte_nl();
+		bfr.Add(Bry__line_end);
+		throw Err_.new_wo_type(bfr.To_str_and_clear());
+	}
+	public static void Eq__int(int expd, int actl) {Eq__int(expd, actl, null);}
+	public static void Eq__int(int expd, int actl, String msg_fmt, Object... msg_args) {
+		if (expd == actl) return;
+		Write_fail_head(bfr, msg_fmt, msg_args);
+		bfr.Add_str_a7("expd: ").Add_int_variable(expd).Add_byte_nl();
+		bfr.Add_str_a7("actl: ").Add_int_variable(actl).Add_byte_nl();
+		bfr.Add(Bry__line_end);
+		throw Err_.new_wo_type(bfr.To_str_and_clear());
+	}
 	public static void Eq__bool_y(boolean actl)			{Eq__bool(Bool_.Y, actl, null);}
 	public static void Eq__bool(boolean expd, boolean actl)	{Eq__bool(expd, actl, null);}
 	public static void Eq__bool(boolean expd, boolean actl, String msg_fmt, Object... msg_args) {
@@ -112,6 +145,7 @@ public class Gftest {
 			switch (type_id) {
 				case Type_adp_.Tid__bry: bfr.Add((byte[])Array_.Get_at(ary, idx)); break;
 				case Type_adp_.Tid__long: bfr.Add_long_variable(Long_.cast(Array_.Get_at(ary, idx))); break;
+				case Type_adp_.Tid__int: bfr.Add_int_variable(Int_.cast(Array_.Get_at(ary, idx))); break;
 				default: throw Err_.new_unhandled_default(type_id);
 			}
 		}
@@ -134,6 +168,7 @@ public class Gftest {
 				switch (tid) {
 					case Type_adp_.Tid__bry:		eq = Bry_.Eq((byte[])expd_obj, (byte[])actl_obj); break;
 					case Type_adp_.Tid__long:		eq = Long_.cast(expd_obj) == Long_.cast(actl_obj); break;
+					case Type_adp_.Tid__int:		eq = Int_.cast(expd_obj) == Int_.cast(actl_obj); break;
 				}
 			}
 			if (!eq) {
diff --git a/400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_itm.java b/100_core/src/gplx/core/threads/poolables/Gfo_poolable_itm.java
similarity index 100%
rename from 400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_itm.java
rename to 100_core/src/gplx/core/threads/poolables/Gfo_poolable_itm.java
diff --git a/400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_mgr.java b/100_core/src/gplx/core/threads/poolables/Gfo_poolable_mgr.java
similarity index 84%
rename from 400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_mgr.java
rename to 100_core/src/gplx/core/threads/poolables/Gfo_poolable_mgr.java
index 669fa8a3f..dd908a809 100644
--- a/400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_mgr.java
+++ b/100_core/src/gplx/core/threads/poolables/Gfo_poolable_mgr.java
@@ -16,15 +16,17 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.threads.poolables; import gplx.*; import gplx.core.*; import gplx.core.threads.*;
-public class Gfo_poolable_mgr {
-	private final Object thread_lock = new Object();
-	private final Gfo_poolable_itm prototype; private final Object[] make_args; 
+import gplx.core.memorys.*;
+public class Gfo_poolable_mgr implements Gfo_memory_itm {
+	private final    Object thread_lock = new Object();
+	private final    Gfo_poolable_itm prototype; private final    Object[] make_args; 
 	private Gfo_poolable_itm[] pool; private int pool_nxt, pool_len;
 	public Gfo_poolable_mgr(Gfo_poolable_itm prototype, Object[] make_args, int init_pool_len, int pool_max) {// NOTE: random IndexOutOfBounds errors in Get around free_ary[--free_len] with free_len being -1; put member variable initialization within thread_lock to try to avoid; DATE:2014-09-21
 		this.prototype = prototype; this.make_args = make_args;
 		this.pool_len = init_pool_len;
 		this.Clear_fast();
 	}
+	public void Rls_mem() {Clear_safe();}
 	public void Clear_safe() {synchronized (thread_lock) {Clear_fast();}}
 	public void Clear_fast() {
 		this.pool = new Gfo_poolable_itm[pool_len];
@@ -87,4 +89,10 @@ public class Gfo_poolable_mgr {
 	@gplx.Internal protected int Free_len() {return free_len;}
 	@gplx.Internal protected int Pool_len() {return pool_len;}
 	@gplx.Internal protected int Pool_nxt() {return pool_nxt;}
+
+	public static Gfo_poolable_mgr New_rlsable(Gfo_poolable_itm prototype, Object[] make_args, int init_pool_len, int pool_max) {
+		Gfo_poolable_mgr rv = new Gfo_poolable_mgr(prototype, make_args, init_pool_len, pool_max);
+		Gfo_memory_mgr.Instance.Reg_safe(rv);
+		return rv;
+	}
 }
diff --git a/400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_mgr_.java b/100_core/src/gplx/core/threads/poolables/Gfo_poolable_mgr_.java
similarity index 100%
rename from 400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_mgr_.java
rename to 100_core/src/gplx/core/threads/poolables/Gfo_poolable_mgr_.java
diff --git a/400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_mgr_tst.java b/100_core/src/gplx/core/threads/poolables/Gfo_poolable_mgr_tst.java
similarity index 88%
rename from 400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_mgr_tst.java
rename to 100_core/src/gplx/core/threads/poolables/Gfo_poolable_mgr_tst.java
index 7e2a32c43..4c63b5be8 100644
--- a/400_xowa/src/gplx/core/threads/poolables/Gfo_poolable_mgr_tst.java
+++ b/100_core/src/gplx/core/threads/poolables/Gfo_poolable_mgr_tst.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.core.threads.poolables; import gplx.*; import gplx.core.*; import gplx.core.threads.*;
 import org.junit.*;
 public class Gfo_poolable_mgr_tst {
-	private final Gfo_poolable_mgr_tstr tstr = new Gfo_poolable_mgr_tstr();
+	private final    Gfo_poolable_mgr_tstr tstr = new Gfo_poolable_mgr_tstr();
 	@Before public void init() {tstr.Clear();}
 	@Test  public void Get__one() {
 		tstr.Test__get(0);
@@ -61,7 +61,7 @@ public class Gfo_poolable_mgr_tst {
 	}
 }
 class Gfo_poolable_mgr_tstr {
-	private final Gfo_poolable_mgr mgr = new Gfo_poolable_mgr(new Sample_poolable_itm(null, -1, Object_.Ary_empty), Object_.Ary("make"), 2, 8);
+	private final    Gfo_poolable_mgr mgr = new Gfo_poolable_mgr(new Sample_poolable_itm(null, -1, Object_.Ary_empty), Object_.Ary("make"), 2, 8);
 	public void Clear() {mgr.Clear_fast();}
 	public void Test__get(int expd_idx) {
 		Sample_poolable_itm actl_itm = (Sample_poolable_itm)mgr.Get_fast();
@@ -76,8 +76,8 @@ class Gfo_poolable_mgr_tstr {
 class Sample_poolable_itm implements Gfo_poolable_itm {
 	private Gfo_poolable_mgr pool_mgr;
 	public Sample_poolable_itm(Gfo_poolable_mgr pool_mgr, int pool_idx, Object[] make_args) {this.pool_mgr = pool_mgr; this.pool_idx = pool_idx; this.pool__make_args = make_args;}
-	public int				Pool__idx() {return pool_idx;} private final int pool_idx;
-	public Object[]			Pool__make_args() {return pool__make_args;} private final Object[] pool__make_args;
+	public int				Pool__idx() {return pool_idx;} private final    int pool_idx;
+	public Object[]			Pool__make_args() {return pool__make_args;} private final    Object[] pool__make_args;
 	public void				Pool__rls() {pool_mgr.Rls_safe(pool_idx);}
 	public Gfo_poolable_itm	Pool__make	(Gfo_poolable_mgr mgr, int idx, Object[] args) {return new Sample_poolable_itm(pool_mgr, idx, args);}
 }
diff --git a/150_gfui/src/gplx/gfui/controls/standards/Gfui_html.java b/150_gfui/src/gplx/gfui/controls/standards/Gfui_html.java
index 01d088493..0926568e8 100644
--- a/150_gfui/src/gplx/gfui/controls/standards/Gfui_html.java
+++ b/150_gfui/src/gplx/gfui/controls/standards/Gfui_html.java
@@ -59,7 +59,14 @@ public class Gfui_html extends GfuiElemBase {
 			rv.Add(Int_.To_str(i), args[i]);	// NOTE: args[i] can be either String or String[]
 		return rv;
 	}
+
 	public static final String Atr_href = "href", Atr_title = "title", Atr_value = "value", Atr_innerHTML = "innerHTML", Atr_src = "src";
 	public static final String Elem_id_body = "body";
-	public static final String Evt_location_changed = "location_changed", Evt_location_changing = "location_changing", Evt_link_hover = "link_hover", Evt_win_resized = "win_resized";
+	public static final String
+	  Evt_location_changed	= "location_changed"
+	, Evt_location_changing = "location_changing"
+	, Evt_link_hover		= "link_hover"
+	, Evt_win_resized		= "win_resized"
+	, Evt_zoom_changed		= "zoom_changed"
+	;
 }
diff --git a/150_gfui/src/gplx/gfui/kits/core/Swt_kit.java b/150_gfui/src/gplx/gfui/kits/core/Swt_kit.java
index 8dd4ab9a8..b7923e1e0 100644
--- a/150_gfui/src/gplx/gfui/kits/core/Swt_kit.java
+++ b/150_gfui/src/gplx/gfui/kits/core/Swt_kit.java
@@ -179,6 +179,7 @@ public class Swt_kit implements Gfui_kit {
 		swt_html.Under_control().addMenuDetectListener(new Swt_lnr__menu_detect(this, gfui_html));
 		gfui_html.Owner_(owner);
 		swt_html.Delete_elems_(owner, gfui_html);
+		swt_html.Evt_mgr_(gfui_html.Evt_mgr());
 		return gfui_html;
 	}
 	public Gfui_tab_mgr New_tab_mgr(String key, GfuiElem owner, Keyval... args) {
diff --git a/150_gfui/src/gplx/gfui/kits/swts/Swt_html.java b/150_gfui/src/gplx/gfui/kits/swts/Swt_html.java
index 6a513c231..afc66057a 100644
--- a/150_gfui/src/gplx/gfui/kits/swts/Swt_html.java
+++ b/150_gfui/src/gplx/gfui/kits/swts/Swt_html.java
@@ -26,6 +26,7 @@ import gplx.gfui.controls.gxws.GxwElem;
 import gplx.gfui.controls.gxws.Gxw_html;
 import gplx.gfui.controls.gxws.Gxw_html_load_tid_;
 import gplx.gfui.controls.standards.Gfui_html;
+import gplx.gfui.controls.standards.Gfui_tab_mgr;
 import gplx.gfui.ipts.*;
 import gplx.gfui.kits.core.Swt_kit;
 
@@ -45,7 +46,7 @@ import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.widgets.*;
 
-public class Swt_html implements Gxw_html, Swt_control, FocusListener {
+public class Swt_html implements Gxw_html, Swt_control, FocusListener, Gfo_evt_mgr_owner {
 	private Swt_html_lnr_location lnr_location; private Swt_html_lnr_status lnr_status;
 	public Swt_html(Swt_kit kit, Swt_control owner_control, Keyval_hash ctorArgs) {
 		this.kit = kit;
@@ -62,10 +63,12 @@ public class Swt_html implements Gxw_html, Swt_control, FocusListener {
 		browser.addStatusTextListener(lnr_status);
 		browser.addFocusListener(this);
 		browser.addTitleListener(new Swt_html_lnr_title(this));
+		browser.addMouseWheelListener(new Swt_html_lnr_wheel(this));
 		// browser.addOpenWindowListener(new Swt_open_window_listener(this));	// handle target='blank'
 		// browser.addTraverseListener(new Swt_html_lnr_Traverse(this));
 	}
 	public Swt_kit Kit() {return kit;} private Swt_kit kit;
+	public Gfo_evt_mgr Evt_mgr() {return ev_mgr;} private Gfo_evt_mgr ev_mgr; 	public void Evt_mgr_(Gfo_evt_mgr v) {ev_mgr = v;}
 	@Override public Control Under_control() {return browser;} private Browser browser;
 	@Override public Composite Under_composite() {return null;}
 	@Override public Control Under_menu_control() {return browser;}
@@ -267,6 +270,17 @@ class Swt_html_lnr_mouse implements MouseListener {
 		return IptEvtDataMouse.new_(btn, IptMouseWheel_.None, ev.x, ev.y);		
 	}
 }
+class Swt_html_lnr_wheel implements MouseWheelListener {
+	private final Swt_html html_box;
+	public Swt_html_lnr_wheel(Swt_html html_box) {
+		this.html_box = html_box;
+	}
+	@Override public void mouseScrolled(MouseEvent evt) {
+		if (evt.stateMask == SWT.CTRL) {	// ctrl held;
+			Gfo_evt_mgr_.Pub_obj(html_box, Gfui_html.Evt_zoom_changed, "clicks_is_positive", evt.count > 0);
+		}
+	}	
+}
 //class Swt_open_window_listener implements OpenWindowListener {
 //	private final Swt_html html_box;
 //	public Swt_open_window_listener(Swt_html html_box) {this.html_box = html_box;}
diff --git a/400_xowa/.classpath b/400_xowa/.classpath
index b360580d7..b00af46bd 100644
--- a/400_xowa/.classpath
+++ b/400_xowa/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/100_core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/140_dbs"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/150_gfui"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="lib/jtidy_xowa.jar"/>
 	<classpathentry kind="lib" path="lib/luaj_xowa.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/400_xowa/src/gplx/core/net/downloads/Http_download_wkr__jre.java b/400_xowa/src/gplx/core/net/downloads/Http_download_wkr__jre.java
index a38c7fd40..71d778cd8 100644
--- a/400_xowa/src/gplx/core/net/downloads/Http_download_wkr__jre.java
+++ b/400_xowa/src/gplx/core/net/downloads/Http_download_wkr__jre.java
@@ -38,7 +38,11 @@ public class Http_download_wkr__jre extends Http_download_wkr__base {
         InputStream src_stream = null;
         URL src_url_itm = null;
         try     {src_url_itm = new URL(src_url);}
-        catch   (MalformedURLException e) {throw Err_.new_("download_file", "bad url", "src", src_url, "err" + e.toString());}
+        catch   (MalformedURLException e) {
+			try {trg_stream.close();}
+			catch (IOException e1) {}
+        	throw Err_.new_("download_file", "bad url", "src", src_url, "err" + e.toString());
+        }
         HttpURLConnection src_conn = null;
         try {
         	// open connection
@@ -50,12 +54,18 @@ public class Http_download_wkr__jre extends Http_download_wkr__base {
             // check response code
             int response_code = src_conn.getResponseCode();
             if (prog_resumed) {
-	            if (response_code != HttpURLConnection.HTTP_PARTIAL)
+	            if (response_code != HttpURLConnection.HTTP_PARTIAL) {
+	    			try {trg_stream.close();}
+	    			catch (IOException e1) {}
 	                throw Err_.new_("download_file", "server returned non-partial response code", "src", src_url, "code", src_conn.getResponseCode(), "msg", src_conn.getResponseMessage());
+	            }
             }
             else {
-	            if (response_code != HttpURLConnection.HTTP_OK)
+	            if (response_code != HttpURLConnection.HTTP_OK) {
+	    			try {trg_stream.close();}
+	    			catch (IOException e1) {}
 	                throw Err_.new_("download_file", "server returned non-OK response code", "src", src_url, "code", src_conn.getResponseCode(), "msg", src_conn.getResponseMessage());
+	            }
             }
             src_stream = src_conn.getInputStream();
         } catch (Exception e) {
diff --git a/400_xowa/src/gplx/langs/htmls/Gfh_tag_.java b/400_xowa/src/gplx/langs/htmls/Gfh_tag_.java
index 46a7d567a..71e8016ae 100644
--- a/400_xowa/src/gplx/langs/htmls/Gfh_tag_.java
+++ b/400_xowa/src/gplx/langs/htmls/Gfh_tag_.java
@@ -52,6 +52,8 @@ public class Gfh_tag_ {	// NOTE: not serialized; used by tag_rdr
 	, Id__i			= 28
 	, Id__b			= 29
 	, Id__sup		= 30
+	, Id__sub		= 31
+	, Id__bdi		= 32
 	;
 	public static final    byte[]
 	  Bry__a			= Bry_.new_a7("a")
@@ -94,6 +96,8 @@ public class Gfh_tag_ {	// NOTE: not serialized; used by tag_rdr
 	.Add_str_int("i"			, Id__i)
 	.Add_str_int("b"			, Id__b)
 	.Add_str_int("sup"			, Id__sup)
+	.Add_str_int("sub"			, Id__sub)
+	.Add_str_int("bdi"			, Id__bdi)
 	;
 	public static String To_str(int tid) {
 		switch (tid) {
@@ -131,6 +135,8 @@ public class Gfh_tag_ {	// NOTE: not serialized; used by tag_rdr
 			case Id__i:				return "i";
 			case Id__b:				return "b";
 			case Id__sup:			return "sup";
+			case Id__sub:			return "sub";
+			case Id__bdi:			return "bdi";
 			default:				throw Err_.new_unhandled(tid);
 		}
 	}
@@ -145,17 +151,16 @@ public class Gfh_tag_ {	// NOTE: not serialized; used by tag_rdr
 	, Pre_lhs					= Bry_.new_a7("<pre>")			, Pre_rhs					= Bry_.new_a7("</pre>")
 	, Div_lhs					= Bry_.new_a7("<div>")			, Div_rhs					= Bry_.new_a7("</div>")
 	, Html_rhs					= Bry_.new_a7("</html>")
-	, Head_lhs_bgn				= Bry_.new_a7("<head")
-	, Head_rhs					= Bry_.new_a7("</head>")
+	, Head_lhs_bgn				= Bry_.new_a7("<head")			, Head_rhs					= Bry_.new_a7("</head>")
 	, Style_lhs_w_type			= Bry_.new_a7("<style type=\"text/css\">")
 	, Style_rhs					= Bry_.new_a7("</style>")
-	, Script_lhs				= Bry_.new_a7("<script>")
+	, Script_lhs				= Bry_.new_a7("<script>")		, Script_rhs				= Bry_.new_a7("</script>")
 	, Script_lhs_w_type			= Bry_.new_a7("<script type='text/javascript'>")
-	, Script_rhs				= Bry_.new_a7("</script>")
-	, Span_lhs					= Bry_.new_a7("<span")
-	, Span_rhs					= Bry_.new_a7("</span>")
-	, Strong_lhs				= Bry_.new_a7("<strong>")
-	, Strong_rhs				= Bry_.new_a7("</strong>")
+	, Span_lhs					= Bry_.new_a7("<span")			, Span_rhs					= Bry_.new_a7("</span>")
+	, Strong_lhs				= Bry_.new_a7("<strong>")		, Strong_rhs				= Bry_.new_a7("</strong>")
+	, Ul_lhs					= Bry_.new_a7("<ul>")			, Ul_rhs					= Bry_.new_a7("</ul>")
+	, Li_lhs					= Bry_.new_a7("<li>")			, Li_rhs					= Bry_.new_a7("</li>")
+	, Li_lhs_bgn				= Bry_.new_a7("<li")
 	;
 	public static final String 
 	  Comm_bgn_str				= "<!--"
diff --git a/400_xowa/src/gplx/langs/htmls/encoders/Gfo_url_encoder_.java b/400_xowa/src/gplx/langs/htmls/encoders/Gfo_url_encoder_.java
index 73bf469f7..506a46972 100644
--- a/400_xowa/src/gplx/langs/htmls/encoders/Gfo_url_encoder_.java
+++ b/400_xowa/src/gplx/langs/htmls/encoders/Gfo_url_encoder_.java
@@ -19,7 +19,8 @@ package gplx.langs.htmls.encoders; import gplx.*; import gplx.langs.*; import gp
 import gplx.core.btries.*;
 import gplx.xowa.parsers.amps.*;
 public class Gfo_url_encoder_ {
-	public static final Gfo_url_encoder
+	public static Gfo_url_encoder New__id() {return Gfo_url_encoder_.New__html_id().Make();}
+	public static final    Gfo_url_encoder
 	  Id				= Gfo_url_encoder_.New__html_id().Make()
 	, Href				= Gfo_url_encoder_.New__html_href_mw(Bool_.Y).Make()
 	, Href_wo_anchor	= Gfo_url_encoder_.New__html_href_mw(Bool_.N).Make()
diff --git a/400_xowa/src/gplx/xowa/Xoa_app_.java b/400_xowa/src/gplx/xowa/Xoa_app_.java
index 9d7690694..f813b6f8b 100644
--- a/400_xowa/src/gplx/xowa/Xoa_app_.java
+++ b/400_xowa/src/gplx/xowa/Xoa_app_.java
@@ -34,7 +34,7 @@ public class Xoa_app_ {
 		}
 	}
 	public static final String		Name			= "xowa";
-	public static final String		Version			= "3.6.4.2";
+	public static final String		Version			= "3.7.1.1";
 	public static String	Build_date		= "2012-12-30 00:00:00";
 	public static String	Op_sys_str;
 	public static String	User_agent		= "";
diff --git a/400_xowa/src/gplx/xowa/Xoa_ttl.java b/400_xowa/src/gplx/xowa/Xoa_ttl.java
index 0bbf466b3..6b0f9b692 100644
--- a/400_xowa/src/gplx/xowa/Xoa_ttl.java
+++ b/400_xowa/src/gplx/xowa/Xoa_ttl.java
@@ -258,12 +258,13 @@ public class Xoa_ttl {	// PAGE:en.w:http://en.wikipedia.org/wiki/Help:Link; REF.
 								}
 							}
 							else {
-								boolean pass = amp_mgr.Parse_as_int(amp_itm.Tid() == Xop_amp_trie_itm.Tid_num_hex, src, end, cur2, match_pos);
-								if (pass) {
-									b_ary = gplx.core.intls.Utf16_.Encode_int_to_bry(amp_mgr.Rslt_val());
+								Xop_amp_mgr_rslt amp_rv = new Xop_amp_mgr_rslt();
+								amp_mgr.Parse_ncr(amp_rv, amp_itm.Tid() == Xop_amp_trie_itm.Tid_num_hex, src, end, cur2, match_pos);
+								if (amp_rv.Pass()) {
+									b_ary = gplx.core.intls.Utf16_.Encode_int_to_bry(amp_rv.Val());
 									if (b_ary.length == 1 && b_ary[0] == Byte_ascii.Hash)	// NOTE: A&#x23;B should be interpreted as A#b; PAGE:en.s:The_English_Constitution_(1894) DATE:2014-09-07
 										anch_bgn = (txt_bb_len) + 1; 
-									match_pos = amp_mgr.Rslt_pos();
+									match_pos = amp_rv.Pos();
 								}
 							}
 						}
diff --git a/400_xowa/src/gplx/xowa/Xop_fxt.java b/400_xowa/src/gplx/xowa/Xop_fxt.java
index 915b882c0..cbe9aebf9 100644
--- a/400_xowa/src/gplx/xowa/Xop_fxt.java
+++ b/400_xowa/src/gplx/xowa/Xop_fxt.java
@@ -95,8 +95,6 @@ public class Xop_fxt {
 	public Xop_tkn_chkr_base tkn_pipe_(int bgn)						{return new Xop_tkn_chkr_base().TypeId_dynamic(Xop_tkn_itm_.Tid_pipe).Src_rng_(bgn, bgn + 1);}
 	public Xop_tkn_chkr_base tkn_tab_(int bgn)						{return new Xop_tkn_chkr_base().TypeId_dynamic(Xop_tkn_itm_.Tid_tab).Src_rng_(bgn, bgn + 1);}
 	public Xop_apos_tkn_chkr tkn_apos_(int cmd) 					{return new Xop_apos_tkn_chkr().Apos_cmd_(cmd);}
-	public Xop_tkn_chkr_base tkn_html_ref_(String v) 				{return new Xop_html_txt_tkn_chkr().Html_ref_key_(v);}
-	public Xop_tkn_chkr_base tkn_html_ncr_(int v) 					{return new Xop_html_num_tkn_chkr().Html_ncr_val_(v);}
 	public Xop_ignore_tkn_chkr tkn_comment_(int bgn, int end)		{return tkn_ignore_(bgn, end, Xop_ignore_tkn.Ignore_tid_comment);}
 	public Xop_ignore_tkn_chkr tkn_ignore_(int bgn, int end, byte t){return (Xop_ignore_tkn_chkr)new Xop_ignore_tkn_chkr().Ignore_tid_(t).Src_rng_(bgn, end);}
 	public Xop_tkn_chkr_hr   tkn_hr_(int bgn, int end)				{return new Xop_tkn_chkr_hr(bgn, end).Hr_len_(Xop_hr_lxr.Hr_len);}
diff --git a/400_xowa/src/gplx/xowa/Xowe_wiki.java b/400_xowa/src/gplx/xowa/Xowe_wiki.java
index cf3771674..9815f3515 100644
--- a/400_xowa/src/gplx/xowa/Xowe_wiki.java
+++ b/400_xowa/src/gplx/xowa/Xowe_wiki.java
@@ -147,7 +147,6 @@ public class Xowe_wiki implements Xow_wiki, Gfo_invk, Gfo_evt_itm {
 	public Xob_import_cfg		Import_cfg() {return import_cfg;} private Xob_import_cfg import_cfg;
 	public Xotdb_fsys_mgr		Tdb_fsys_mgr() {return tdb_fsys_mgr;} private final    Xotdb_fsys_mgr tdb_fsys_mgr;
 	public Xou_history_cfg		Cfg_history() {return cfg_history;} private Xou_history_cfg cfg_history = new Xou_history_cfg();
-	public Xoh_cfg_gallery		Cfg_gallery() {return cfg_gallery;} private Xoh_cfg_gallery cfg_gallery = new Xoh_cfg_gallery();
 	public Xoh_file_page_wtr	Cfg_file_page() {return cfg_file_page;} private Xoh_file_page_wtr cfg_file_page = new Xoh_file_page_wtr();
 	public Xow_sys_cfg			Sys_cfg() {return sys_cfg;} private Xow_sys_cfg sys_cfg;
 	public Xowc_parser			Cfg_parser() {return cfg_parser;} private Xowc_parser cfg_parser;
@@ -235,7 +234,6 @@ public class Xowe_wiki implements Xow_wiki, Gfo_invk, Gfo_evt_itm {
 		if		(ctx.Match(k, Invk_files))				return file_mgr;
 		else if	(ctx.Match(k, Invk_stats))				return stats;
 		else if	(ctx.Match(k, Invk_props))				return props;
-		else if	(ctx.Match(k, Invk_cfg_gallery_))		return cfg_gallery;
 		else if	(ctx.Match(k, Invk_commons_wiki_))		commons_wiki_key = m.ReadBry("v");
 		else if	(ctx.Match(k, Invk_lang))				return lang;
 		else if	(ctx.Match(k, Invk_lang_))				throw Err_.new_deprecated("wiki.lang_");
@@ -263,7 +261,7 @@ public class Xowe_wiki implements Xow_wiki, Gfo_invk, Gfo_evt_itm {
 		return this;
 	}
 	public static final String
-	  Invk_files = "files", Invk_cfg_gallery_ = "cfg_gallery_", Invk_commons_wiki_ = "commons_wiki_", Invk_stats = "stats"
+	  Invk_files = "files", Invk_commons_wiki_ = "commons_wiki_", Invk_stats = "stats"
 	, Invk_lang = "lang", Invk_html = "html", Invk_gui = "gui", Invk_cfg_history = "cfg_history", Invk_user = "user", Invk_data_mgr = "data_mgr", Invk_sys_cfg = "sys_cfg", Invk_ns_mgr = "ns_mgr"
 	, Invk_special = "special"
 	, Invk_props = "props", Invk_parser = "parser"
diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/cmds/Xobc_cmd__base.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/cmds/Xobc_cmd__base.java
index c87fe1e3b..c1efe317c 100644
--- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/cmds/Xobc_cmd__base.java
+++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/cmds/Xobc_cmd__base.java
@@ -44,7 +44,9 @@ public abstract class Xobc_cmd__base implements Xobc_cmd_itm {
 	@gplx.Virtual public String	Cmd_fallback()	{return this.Cmd_type();}
 	@gplx.Virtual public void		Cmd_clear()		{// called when restarting failed task
 		this.status = Gfo_prog_ui_.Status__init;
-		this.cmd_exec_err = null;
+		this.cmd_exec_err = null;	// reset error
+		this.data_cur = 0;			// reset progress else bad progress updates; DATE:2016-06-29
+		this.Cmd_cleanup();			// do any cleanup, such as deleting bad downloads
 	}	
 
 	public void Cmd_exec(Xobc_cmd_ctx ctx) {
@@ -57,20 +59,23 @@ public abstract class Xobc_cmd__base implements Xobc_cmd_itm {
 			Gfo_log_.Instance.Info("xobc_cmd task end", "task_id", task_id, "step_id", step_id, "cmd_id", cmd_id);
 			switch (status) {
 				case Gfo_prog_ui_.Status__suspended:	task_mgr.Work_mgr().On_suspended(this); break;
-				case Gfo_prog_ui_.Status__fail:			task_mgr.Work_mgr().On_fail(this, cmd_exec_err); break;
+				case Gfo_prog_ui_.Status__fail:			task_mgr.Work_mgr().On_fail(this, Bool_.N, cmd_exec_err); break;
 				case Gfo_prog_ui_.Status__working:
 					this.Prog_notify_and_chk_if_suspended(data_end, data_end);	// fire one more time for 100%; note that 100% may not fire due to timer logic below
 					task_mgr.Work_mgr().On_done(this); 
 					break;
 			}
 		} catch (Exception e) {
+			this.status = Gfo_prog_ui_.Status__fail;
 			Gfo_log_.Instance.Warn("xobc_cmd task fail", "task_id", task_id, "step_id", step_id, "cmd_id", cmd_id, "err", Err_.Message_gplx_log(e));
+			task_mgr.Work_mgr().On_fail(this, this.Cmd_fail_resumes(), Err_.Message_lang(e));
 		}
 		finally {
 			Gfo_log_.Instance.Flush();
 		}
 	}
 	protected abstract void Cmd_exec_hook(Xobc_cmd_ctx ctx);
+	@gplx.Virtual protected boolean Cmd_fail_resumes() {return false;}
 	protected void Cmd_exec_err_(String v) {
 		Gfo_log_.Instance.Warn("xobc_cmd task err", "task_id", task_id, "step_id", step_id, "cmd_id", cmd_id, "err", v);
 		this.status = Gfo_prog_ui_.Status__fail;
diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/cmds/Xobc_cmd__download.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/cmds/Xobc_cmd__download.java
index 04e5cf96a..f085551a1 100644
--- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/cmds/Xobc_cmd__download.java
+++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/cmds/Xobc_cmd__download.java
@@ -38,6 +38,8 @@ public class Xobc_cmd__download extends Xobc_cmd__base {
 	@Override public void Cmd_cleanup() {
 		wkr.Exec_cleanup();
 	}
+	@Override protected boolean Cmd_fail_resumes() {return true;}
+
 	@Override protected long Load_checkpoint_hook() {
 		return wkr.Checkpoint__load_by_trg_fil(trg_url);
 	}
diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__work.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__work.java
index 428005b89..dfa547dc8 100644
--- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__work.java
+++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__work.java
@@ -113,11 +113,12 @@ public class Xobc_task_regy__work extends Xobc_task_regy__base {
 			step.Cmd_idx_next_();
 		}
 
+		// release wake_lock; will be acquired when task is run_next; DATE:2016-06-29
+		Xod_power_mgr_.Instance.Wake_lock__rls("task_mgr");
+
 		// task_regy.done
 		if (task_is_done) {
-			if (this.Len() == 0)
-				Xod_power_mgr_.Instance.Wake_lock__rls("task_mgr");
-			else
+			if (this.Len() > 0)
 				this.Run_next();
 		}
 		// task_regy.work
@@ -132,8 +133,8 @@ public class Xobc_task_regy__work extends Xobc_task_regy__base {
 		task.Task_status_(Gfo_prog_ui_.Status__suspended);
 		task_mgr.Send_json("xo.bldr.work.stop_cur__recv", Gfobj_nde.New().Add_int("task_id", task.Task_id()));
 	}
-	public void On_fail(Xobc_cmd_itm task, String msg) {
+	public void On_fail(Xobc_cmd_itm task, boolean resume, String msg) {
 		Xod_power_mgr_.Instance.Wake_lock__rls("task_mgr");
-		task_mgr.Send_json("xo.bldr.work.prog__fail__recv", Gfobj_nde.New().Add_int("task_id", task.Task_id()).Add_str("err", msg));
+		task_mgr.Send_json("xo.bldr.work.prog__fail__recv", Gfobj_nde.New().Add_int("task_id", task.Task_id()).Add_str("err", msg).Add_bool("resume", resume));
 	}
 }
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java
index 9ad9f3f80..68da7faac 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java
@@ -79,6 +79,7 @@ public class Srch_search_mgr {
 		}
 	}
 	private void Clear() {
+		Gfo_usr_dlg_.Instance.Log_many("", "", "search.clear");
 		search_count = 0;
 		cache__page.Clear();
 		cache__word_counts.Clear();
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr.java
index 5886f57f7..5326a1f75 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr.java
@@ -32,6 +32,7 @@ public class Srch_link_wkr extends Percentile_select_base {
 	private Srch_crt_itm sql_root;
 	public void Search(Srch_rslt_list rslts_list, Srch_rslt_cbk rslt_cbk, Srch_search_ctx ctx) {
 		// init
+		Gfo_usr_dlg_.Instance.Log_many("", "", "search.search by link_tbl; search=~{0}", ctx.Qry.Phrase.Orig);
 		super.cxl = ctx.Cxl;
 		super.rng = ctx.Score_rng;
 		super.rng_log = new Percentile_rng_log(ctx.Addon.Db_mgr().Cfg().Link_score_max());
@@ -54,15 +55,15 @@ public class Srch_link_wkr extends Percentile_select_base {
 			sql_root = Srch_link_wkr_.Find_sql_root(ctx);
 			attach_mgr.Conn_others_(new Db_attach_itm("page_db", ctx.Db__core.Conn()), new Db_attach_itm("word_db", ctx.Tbl__word.conn));
 			super.Select();
-		} 
+		}
 		finally {
 			try {
-				// gplx.core.consoles.Console_adp__sys.Instance.Write_str_w_nl("detaching: " + String_.new_u8(ctx.Qry.Phrase.Lcase_wild) + " " + Int_.To_str(ctx.Score_rng.Score_bgn()) + " " + Int_.To_str(ctx.Score_rng.Score_end()) + " " + attach_mgr.List__to_str());
+				Gfo_usr_dlg_.Instance.Log_many("", "", "search.detaching; phrase=~{0} score_bgn=~{1} score_end=~{2}", ctx.Qry.Phrase.Orig, ctx.Score_rng.Score_bgn(), ctx.Score_rng.Score_end());
 				attach_mgr.Detach();
 				stmt = Db_stmt_.Rls(stmt);
 			}
 			catch (Exception e) {
-				gplx.core.consoles.Console_adp__sys.Instance.Write_str_w_nl("detaching err: " + String_.new_u8(ctx.Qry.Phrase.Orig) + " " + Int_.To_str(ctx.Score_rng.Score_bgn()) + Err_.Message_lang(e));
+				Gfo_usr_dlg_.Instance.Log_many("", "", "search.detaching fail; phrase=~{0} score_bgn=~{1} err=~{2}", ctx.Qry.Phrase.Orig, ctx.Score_rng.Score_bgn(), Err_.Message_gplx_log(e));
 			}
 		}
 	}	
@@ -115,7 +116,7 @@ public class Srch_link_wkr extends Percentile_select_base {
 		rslt_cbk.On_rslts_found(ctx.Qry, rslts_list, rslts_bgn, rslts_end);
 		rslts_list.Rslts_are_first = false;
 		rslts_bgn = rslts_end;
-		// gplx.core.consoles.Console_adp__sys.Instance.Write_str(rng_log.To_str_and_clear());
+		// Gfo_usr_dlg_.Instance.Log_many("", "", "search.search rslts; rslts=~{0}", rng_log.To_str_and_clear());
 	}
 	@Override protected boolean Row__read(Db_rdr rdr) {
 		if (!rdr.Move_next()) return false;
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr_sql.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr_sql.java
index 48004f09e..75b5c292a 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr_sql.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr_sql.java
@@ -39,11 +39,11 @@ public class Srch_link_wkr_sql {
 	public String Write(Srch_search_ctx ctx, Db_attach_mgr attach_mgr) {
 		String sql = stmt_mgr.Bfr().To_str_and_clear();
 		try {
-			// gplx.core.consoles.Console_adp__sys.Instance.Write_str_w_nl("attaching: " + String_.new_u8(ctx.Qry.Phrase.Lcase_wild) + " " + Int_.To_str(ctx.Score_rng.Score_bgn()) + " " + Int_.To_str(ctx.Score_rng.Score_end()) + " " + attach_mgr.List__to_str());
+			Gfo_usr_dlg_.Instance.Log_many("", "", "search.resolving; phrase=~{0} score_bgn=~{1} score_end=~{2}", ctx.Qry.Phrase.Orig, ctx.Score_rng.Score_bgn(), ctx.Score_rng.Score_end());
 			sql = attach_mgr.Resolve_sql(sql);
 		}
 		catch (Exception e) {
-			gplx.core.consoles.Console_adp__sys.Instance.Write_str_w_nl("attaching err: " + String_.new_u8(ctx.Qry.Phrase.Orig) + " " + Int_.To_str(ctx.Score_rng.Score_bgn()) + " " + Int_.To_str(ctx.Score_rng.Score_end())  + Err_.Message_lang(e));
+			Gfo_usr_dlg_.Instance.Log_many("", "", "search.resolving err; phrase=~{0} score_bgn=~{1} score_end=~{2} err=~{3}", ctx.Qry.Phrase.Orig, ctx.Score_rng.Score_bgn(), ctx.Score_rng.Score_end(), Err_.Message_gplx_log(e));
 		}
 		return sql;
 	}
@@ -53,7 +53,6 @@ public class Srch_link_wkr_sql {
 		return cur_link_conn.Stmt_sql(sql);
 	}
 	public void Fill(Db_stmt stmt) {
-		// gplx.core.consoles.Console_adp__sys.Instance.Write_str_w_nl(String_.new_u8(ctx.Qry.Phrase.Orig) + " " + Int_.To_str(ctx.Score_rng.Score_bgn()) + " " + Int_.To_str(ctx.Score_rng.Score_end()));
 		stmt_mgr.Fill_stmt_and_clear(stmt);
 	}
 	private void Bld_where(Srch_search_ctx ctx, Srch_crt_itm node) {
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_page_tbl_wkr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_page_tbl_wkr.java
index 93093d1a3..435144055 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_page_tbl_wkr.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_page_tbl_wkr.java
@@ -25,6 +25,7 @@ public class Srch_page_tbl_wkr {
 	public void Search(Srch_search_ctx ctx, Srch_rslt_cbk cbk) {
 		byte[] search_raw = To_bry_or_null(tmp_bfr, ctx.Scanner_syms.Wild(), ctx.Crt_mgr);	// build up search String but handle escapes "\+" -> "+"
 		if (search_raw == null) return;	// search-term has not or symbols; EX: "earth -history"; "(earth & history)"
+		Gfo_usr_dlg_.Instance.Log_many("", "", "search.search by page_tbl; search=~{0}", search_raw);
 		Xoa_ttl ttl = ctx.Wiki.Ttl_parse(search_raw); if (ttl == null) return;
 		Xowd_page_tbl page_tbl = ctx.Tbl__page;
 		if (ctx.Cxl.Canceled()) return;
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_word_count_wkr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_word_count_wkr.java
index fbb24e5fa..f97e46725 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_word_count_wkr.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_word_count_wkr.java
@@ -63,7 +63,7 @@ class Srch_word_count_wkr extends Percentile_select_base {
 		return rows_read > 0 || score_too_low;
 	}
 	@Override protected void Rdr__done(boolean rslts_are_enough, boolean rslts_are_done) {
-		// if (rslts_are_enough) gplx.core.consoles.Console_adp__sys.Instance.Write_str(rng_log.To_str_and_clear());
+		if (rslts_are_enough) Gfo_usr_dlg_.Instance.Log_many("", "", "search.word_count; rng=~{0}", rng_log.To_str_and_clear());
 	}
 	private static Bry_fmt
 	  Fmt__main = Bry_fmt.Auto(String_.Concat_lines_nl_skip_last
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_cmd.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_cmd.java
index 65899bb3e..429a21ded 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_cmd.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_cmd.java
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.addons.wikis.searchs.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*;
 import gplx.core.threads.*;
-import gplx.xowa.files.gui.*; import gplx.xowa.guis.views.*;
+import gplx.xowa.guis.cbks.js.*; import gplx.xowa.guis.views.*;
 import gplx.xowa.addons.wikis.searchs.specials.htmls.*; import gplx.xowa.addons.wikis.searchs.searchers.*; import gplx.xowa.addons.wikis.searchs.searchers.rslts.*;
 public class Srch_special_cmd implements Gfo_invk, Srch_rslt_cbk, Xog_tab_close_lnr {
 	private final    Srch_special_searcher mgr; private final    Srch_search_qry qry;
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/htmls/Srch_html_row_wkr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/htmls/Srch_html_row_wkr.java
index e5d0968ab..ffd5e5299 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/htmls/Srch_html_row_wkr.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/htmls/Srch_html_row_wkr.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.addons.wikis.searchs.specials.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.specials.*;
-import gplx.langs.htmls.*; import gplx.xowa.files.gui.*;
+import gplx.langs.htmls.*; import gplx.xowa.guis.cbks.js.*;
 import gplx.xowa.addons.wikis.searchs.searchers.*; import gplx.xowa.addons.wikis.searchs.searchers.rslts.*;
 public class Srch_html_row_wkr {
 	private final    Srch_html_row_bldr html_row_bldr; private final    Xog_js_wkr js_wkr;
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/htmls/Srch_rslt_cbk_tst.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/htmls/Srch_rslt_cbk_tst.java
index 2830c6979..56f4b69d4 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/htmls/Srch_rslt_cbk_tst.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/htmls/Srch_rslt_cbk_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.addons.wikis.searchs.specials.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.specials.*;
-import org.junit.*; import gplx.xowa.htmls.core.htmls.utls.*; import gplx.xowa.files.gui.*; import gplx.xowa.addons.wikis.searchs.searchers.rslts.*;
+import org.junit.*; import gplx.xowa.htmls.core.htmls.utls.*; import gplx.xowa.guis.cbks.js.*; import gplx.xowa.addons.wikis.searchs.searchers.rslts.*;
 public class Srch_rslt_cbk_tst {
 	@Before public void init() {fxt.Clear();} private Srch_rslt_cbk_fxt fxt = new Srch_rslt_cbk_fxt();
 	@Test   public void Basic() {			
diff --git a/400_xowa/src/gplx/xowa/apps/apis/xowa/gui/Xoapi_font.java b/400_xowa/src/gplx/xowa/apps/apis/xowa/gui/Xoapi_font.java
index a28df971a..e513aeac0 100644
--- a/400_xowa/src/gplx/xowa/apps/apis/xowa/gui/Xoapi_font.java
+++ b/400_xowa/src/gplx/xowa/apps/apis/xowa/gui/Xoapi_font.java
@@ -25,7 +25,7 @@ public class Xoapi_font implements Gfo_invk {
 	public void Increase() {Adj(1);}
 	public void Decrease() {Adj(-1);}
 	public void Reset() {Set(false, Xoh_page_mgr.Font_size_default, Xocfg_win.Font_size_default);}
-	private void Adj(int adj) {
+	public void Adj(int adj) {
 		float html_font_size = app.Html_mgr().Page_mgr().Font_size() + adj;
 		float gui_font_size = app.Gui_mgr().Win_cfg().Font().Size() + adj; // (html_font_size * .75f) - 4;	// .75f b/c 16px = 12 pt; -4 b/c gui font is currently 4 pt smaller 
 		if (html_font_size < 1 || gui_font_size < 1) return;
diff --git a/400_xowa/src/gplx/xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java b/400_xowa/src/gplx/xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java
index 38e355a06..b34e99e77 100644
--- a/400_xowa/src/gplx/xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java
+++ b/400_xowa/src/gplx/xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java
@@ -41,7 +41,7 @@ public class Wmf_dump_list_parser_tst {
 		,	fxt.itm("zh-classicalwiki", "20131128", Wmf_dump_itm.Status_tid_complete, "Dump complete", "2013-11-28 06:08:56")
 		);
 	}
-//		@Test  public void Update() {	// MAINT:QUARTERLY:2016-03-17; must run C:\xowa\ and update dump status
+//		@Test  public void Update() {	// MAINT:QUARTERLY:2016-07-03; must run C:\xowa\ and update dump status
 //			Hash_adp_bry excluded_domains = Hash_adp_bry.cs().Add_many_str
 //			( "advisory.wikipedia.org", "beta.wikiversity.org", "donate.wikipedia.org", "login.wikipedia.org"
 //			, "nostalgia.wikipedia.org", "outreach.wikipedia.org", "quality.wikipedia.org", "sources.wikipedia.org"
diff --git a/400_xowa/src/gplx/xowa/drds/Xod_app.java b/400_xowa/src/gplx/xowa/drds/Xod_app.java
index 534684d6f..0834c1b9f 100644
--- a/400_xowa/src/gplx/xowa/drds/Xod_app.java
+++ b/400_xowa/src/gplx/xowa/drds/Xod_app.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.drds; import gplx.*; import gplx.xowa.*;
 import gplx.xowa.drds.pages.*; import gplx.xowa.drds.files.*;
 import gplx.xowa.apps.*; import gplx.xowa.wikis.data.tbls.*;
-import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.files.gui.*;
+import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.guis.cbks.js.*;
 import gplx.xowa.addons.wikis.searchs.searchers.rslts.*;
 import gplx.langs.htmls.encoders.*; import gplx.xowa.htmls.hrefs.*;
 import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*;
diff --git a/400_xowa/src/gplx/xowa/drds/files/Xod_file_mgr.java b/400_xowa/src/gplx/xowa/drds/files/Xod_file_mgr.java
index 12d575ad5..1e8c5f2f3 100644
--- a/400_xowa/src/gplx/xowa/drds/files/Xod_file_mgr.java
+++ b/400_xowa/src/gplx/xowa/drds/files/Xod_file_mgr.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.drds.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.drds.*;
 import gplx.core.threads.*;
 import gplx.xowa.drds.pages.*;
-import gplx.xowa.files.*; import gplx.xowa.files.gui.*;
+import gplx.xowa.files.*; import gplx.xowa.guis.cbks.js.*;
 import gplx.xowa.htmls.*;
 public class Xod_file_mgr {
 	private final    Gfo_thread_pool thread_pool = new Gfo_thread_pool();
diff --git a/400_xowa/src/gplx/xowa/files/Xof_file_itm.java b/400_xowa/src/gplx/xowa/files/Xof_file_itm.java
index b3a3362b6..773634dac 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_file_itm.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_file_itm.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
-import gplx.xowa.files.gui.*; import gplx.xowa.files.repos.*;
+import gplx.xowa.guis.cbks.js.*; import gplx.xowa.files.repos.*;
 public interface Xof_file_itm {
 	int					Lnki_exec_tid();
 	byte[]				Lnki_wiki_abrv();
diff --git a/400_xowa/src/gplx/xowa/files/Xof_file_wkr.java b/400_xowa/src/gplx/xowa/files/Xof_file_wkr.java
index cc1478be1..ec8bdebbd 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_file_wkr.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_file_wkr.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
 import gplx.core.threads.*; import gplx.core.ios.*; import gplx.core.ios.streams.*;
 import gplx.fsdb.*; import gplx.fsdb.meta.*; import gplx.fsdb.data.*; import gplx.xowa.files.fsdb.*;
-import gplx.xowa.files.repos.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*; import gplx.xowa.files.gui.*;
+import gplx.xowa.files.repos.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*; import gplx.xowa.guis.cbks.js.*;
 import gplx.xowa.htmls.core.makes.imgs.*;
 public class Xof_file_wkr implements Gfo_thread_wkr {
 	private final    Xof_orig_mgr orig_mgr; private final    Xof_bin_mgr bin_mgr; private final    Fsm_mnt_mgr mnt_mgr; private final    Xou_cache_mgr cache_mgr;
diff --git a/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm.java b/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm.java
index 512bedab6..3b958c50d 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm.java
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
 import gplx.core.ios.*;
-import gplx.xowa.files.gui.*; import gplx.xowa.files.repos.*;
+import gplx.xowa.guis.cbks.js.*; import gplx.xowa.files.repos.*;
 import gplx.xowa.parsers.lnkis.*;
 public class Xof_fsdb_itm implements Xof_file_itm {
 	private int lnki_upright_patch;
diff --git a/400_xowa/src/gplx/xowa/files/Xof_img_size.java b/400_xowa/src/gplx/xowa/files/Xof_img_size.java
index d7366b4ae..4868285d0 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_img_size.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_img_size.java
@@ -90,13 +90,6 @@ public class Xof_img_size {
 			}
 		}
 	}
-//		private static boolean Calc_limit_size(int exec_tid, int lnki_type, int lnki_ext) {
-//			if (lnki_type != Xop_lnki_type.Id_thumb) return false;  // only limit to size for thumb; EX:[[File:A.png|thumb|999x999px]] does not get limited but [[File:A.png|999x999px]] does  
-//			if (lnki_ext == Xof_ext_.Id_svg)						// if svg...
-//				return exec_tid == Xof_exec_tid.Tid_wiki_file;		// ... only limit to size if [[File]] page
-//			else													// not svg and thumb; always limit to size
-//				return true;
-//		}
 	public static int Calc_w(int file_w, int file_h, int lnki_h) {		// REF.MW:media/MediaHandler.php|fitBoxWidth
 		double ideal_w = (double)file_w * (double)lnki_h / (double)file_h;
 		double ideal_w_ceil = Math_.Ceil(ideal_w);
@@ -142,7 +135,7 @@ public class Xof_img_size {
 	}
 	public static final int Null = -1;
 	public static final int Thumb_width_img = 220, Thumb_width_ogv = 220;
-	public static final double Upright_null = -1, Upright_default_marker = 0; // REF:MW: if ( isset( $fp['upright'] ) && $fp['upright'] == 0 )
+	public static final    double Upright_null = -1, Upright_default_marker = 0; // REF:MW: if ( isset( $fp['upright'] ) && $fp['upright'] == 0 )
 	public static final int Size__neg1 = -1, Size_null = 0;	// Size_null = 0, b/c either imageMagick / inkscape fails when -1 is passed
 	public static final int Size__same_as_orig = -1;
 	private static final int Svg_max_width = 2048;
diff --git a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java
index e69f010d1..210c4f559 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
 import gplx.core.primitives.*;
-import gplx.xowa.files.gui.*; import gplx.xowa.files.repos.*;
+import gplx.xowa.guis.cbks.js.*; import gplx.xowa.files.repos.*;
 import gplx.xowa.wikis.tdbs.metas.*;
 import gplx.xowa.parsers.utils.*;
 public class Xof_xfer_itm implements Xof_file_itm {
diff --git a/400_xowa/src/gplx/xowa/files/Xog_redlink_thread.java b/400_xowa/src/gplx/xowa/files/Xog_redlink_thread.java
index afbdeffcb..d2f776c3e 100644
--- a/400_xowa/src/gplx/xowa/files/Xog_redlink_thread.java
+++ b/400_xowa/src/gplx/xowa/files/Xog_redlink_thread.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
-import gplx.core.threads.*; import gplx.xowa.files.gui.*;
+import gplx.core.threads.*; import gplx.xowa.guis.cbks.js.*;
 public class Xog_redlink_thread implements Gfo_thread_wkr {
 	private final    int[] redlink_ary; private final    Xog_js_wkr js_wkr;
 	public Xog_redlink_thread(int[] redlink_ary, Xog_js_wkr js_wkr) {this.redlink_ary = redlink_ary; this.js_wkr = js_wkr;}
diff --git a/400_xowa/src/gplx/xowa/files/caches/Xou_file_itm_finder.java b/400_xowa/src/gplx/xowa/files/caches/Xou_file_itm_finder.java
index d133b0244..cacbe0edf 100644
--- a/400_xowa/src/gplx/xowa/files/caches/Xou_file_itm_finder.java
+++ b/400_xowa/src/gplx/xowa/files/caches/Xou_file_itm_finder.java
@@ -17,9 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.files.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
 import gplx.core.ios.*;
-import gplx.xowa.files.origs.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.gui.*;
+import gplx.xowa.files.origs.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.files.bins.*; import gplx.xowa.guis.cbks.js.*;
 public class Xou_file_itm_finder {
-	private final Xou_cache_mgr cache_mgr; private final Xof_img_size img_size = new Xof_img_size(); private final Xof_url_bldr url_bldr = Xof_url_bldr.new_v2();
+	private final    Xou_cache_mgr cache_mgr; private final    Xof_img_size img_size = new Xof_img_size(); private final    Xof_url_bldr url_bldr = Xof_url_bldr.new_v2();
 	public Xou_file_itm_finder(Xou_cache_mgr cache_mgr) {this.cache_mgr = cache_mgr;}
 	public boolean Find(Xowe_wiki wiki, int exec_tid, Xof_file_itm xfer, byte[] page_url) {
 		byte[] lnki_ttl = xfer.Lnki_ttl();
diff --git a/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr.java b/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr.java
index df532b1e8..ad2dc9abe 100644
--- a/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr.java
+++ b/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr.java
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.files.fsdb; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
 import gplx.fsdb.*; import gplx.fsdb.data.*; import gplx.fsdb.meta.*;
-import gplx.xowa.files.bins.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.caches.*; import gplx.xowa.files.gui.*;
+import gplx.xowa.files.bins.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.caches.*; import gplx.xowa.guis.cbks.js.*;
 public interface Xof_fsdb_mgr {
 	Xof_bin_mgr Bin_mgr();
 	Fsm_mnt_mgr Mnt_mgr();
diff --git a/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr__sql.java b/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr__sql.java
index 219d99b4e..18a6a73b4 100644
--- a/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr__sql.java
+++ b/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr__sql.java
@@ -20,7 +20,7 @@ import gplx.core.primitives.*;
 import gplx.core.ios.*;
 import gplx.dbs.*; import gplx.xowa.wikis.data.*;
 import gplx.fsdb.*; import gplx.fsdb.meta.*;	
-import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.imgs.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*; import gplx.xowa.files.gui.*;
+import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.imgs.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*; import gplx.xowa.guis.cbks.js.*;
 public class Xof_fsdb_mgr__sql implements Xof_fsdb_mgr, Gfo_invk {
 	private boolean init = false; private boolean fsdb_enabled = false;
 	private Xow_repo_mgr repo_mgr; private Xof_url_bldr url_bldr; private final    Xof_img_size img_size = new Xof_img_size();
diff --git a/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Fs_root_fsdb_mgr.java b/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Fs_root_fsdb_mgr.java
index a9a3f329d..491b8cfa2 100644
--- a/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Fs_root_fsdb_mgr.java
+++ b/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Fs_root_fsdb_mgr.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.files.fsdb.fs_roots; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*;
 import gplx.core.ios.*; import gplx.core.brys.fmtrs.*; import gplx.core.envs.*;
 import gplx.fsdb.*; import gplx.fsdb.data.*; import gplx.fsdb.meta.*;	
-import gplx.xowa.files.gui.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*;
+import gplx.xowa.guis.cbks.js.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*;
 public class Fs_root_fsdb_mgr implements Xof_fsdb_mgr, Gfo_invk {	// read images from file-system dir
 	private Xowe_wiki wiki; private Fs_root_wkr_fsdb fsdb_wkr;
 	public Fs_root_fsdb_mgr(Xowe_wiki wiki) {this.Init_by_wiki(wiki); fsdb_wkr = new Fs_root_wkr_fsdb(wiki);}		
diff --git a/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java b/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java
index ed1389048..4428f2ae5 100644
--- a/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java
+++ b/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.files.fsdb.tsts; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*;
 import gplx.core.envs.*;
-import gplx.fsdb.*; import gplx.fsdb.meta.*; import gplx.dbs.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.cnvs.*; import gplx.xowa.files.exts.*; import gplx.xowa.files.gui.*;
+import gplx.fsdb.*; import gplx.fsdb.meta.*; import gplx.dbs.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.cnvs.*; import gplx.xowa.files.exts.*; import gplx.xowa.guis.cbks.js.*;
 import gplx.fsdb.data.*;
 import gplx.xowa.wikis.domains.*; import gplx.xowa.files.repos.*; import gplx.xowa.wikis.data.*;
 import gplx.xowa.wikis.nss.*;
diff --git a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue.java b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue.java
index 984cd1775..bd8df757b 100644
--- a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue.java
+++ b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.files.xfers; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
 import gplx.core.primitives.*; import gplx.core.envs.*;
 import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.origs.*;
-import gplx.xowa.files.gui.*;
+import gplx.xowa.guis.cbks.js.*;
 import gplx.xowa.wikis.tdbs.metas.*;
 public class Xof_xfer_queue {
 	private final    List_adp xfer_list = List_adp_.New(); private final    Ordered_hash dirty_meta_mgrs = Ordered_hash_.New_bry();
diff --git a/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java b/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java
index d652dcaf9..15dd35fdd 100644
--- a/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java
+++ b/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java
@@ -121,7 +121,7 @@ public class Xog_bnd_mgr {
 		Init_itm(Xog_cmd_itm_.Key_gui_page_view_reload							, Xog_bnd_box_.Tid_browser				, "key.f5");
 		Init_itm(Xog_cmd_itm_.Key_gui_page_view_refresh							, Xog_bnd_box_.Tid_browser				, "mod.s+key.f5");
 		Init_itm(Xog_cmd_itm_.Key_gui_page_view_save_as							, Xog_bnd_box_.Tid_browser				, "");
-		Init_itm(Xog_cmd_itm_.Key_gui_page_view_print							, Xog_bnd_box_.Tid_browser				, "");
+		Init_itm(Xog_cmd_itm_.Key_gui_page_view_print							, Xog_bnd_box_.Tid_browser				, "mod.c+key.p");
 		Init_itm(Xog_cmd_itm_.Key_gui_page_selection_select_all					, Xog_bnd_box_.Tid_browser				, "");
 		Init_itm(Xog_cmd_itm_.Key_gui_page_selection_copy						, Xog_bnd_box_.Tid_browser				, "");
 		Init_itm(Xog_cmd_itm_.Key_gui_page_selection_save_file_as				, Xog_bnd_box_.Tid_browser				, "");
diff --git a/400_xowa/src/gplx/xowa/files/gui/Js_img_mgr.java b/400_xowa/src/gplx/xowa/guis/cbks/js/Js_img_mgr.java
similarity index 76%
rename from 400_xowa/src/gplx/xowa/files/gui/Js_img_mgr.java
rename to 400_xowa/src/gplx/xowa/guis/cbks/js/Js_img_mgr.java
index 47833db23..6d0d504bb 100644
--- a/400_xowa/src/gplx/xowa/files/gui/Js_img_mgr.java
+++ b/400_xowa/src/gplx/xowa/guis/cbks/js/Js_img_mgr.java
@@ -15,22 +15,24 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa.files.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
+package gplx.xowa.guis.cbks.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.cbks.*;
 import gplx.xowa.xtns.gallery.*;
-import gplx.xowa.files.fsdb.*; import gplx.xowa.guis.views.*;
-import gplx.xowa.parsers.lnkis.*;
+import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*;
+import gplx.xowa.guis.views.*; import gplx.xowa.parsers.lnkis.*;
 public class Js_img_mgr {
-	public static void Update_img(Xoa_page page, Xog_js_wkr js_wkr, Xof_file_itm itm) {
-		Js_img_mgr.Update_img(page, js_wkr, itm.Html_img_wkr(), itm.Html_uid(), itm.Lnki_type(), itm.Html_elem_tid(), itm.Html_w(), itm.Html_h(), itm.Html_view_url(), itm.Orig_w(), itm.Orig_h(), itm.Html_orig_url(), itm.Orig_ttl(), itm.Html_gallery_mgr_h());
-	}
 	public static void Update_link_missing(Xog_js_wkr html_itm, String html_id) {
 		html_itm.Html_redlink(html_id);
 	}
-	private static void Update_img(Xoa_page page, Xog_js_wkr js_wkr, Js_img_wkr img_wkr, int uid, byte lnki_type, byte elem_tid, int html_w, int html_h, Io_url html_view_url, int orig_w, int orig_h, Io_url html_orig_url, byte[] lnki_ttl, int gallery_mgr_h) {
+	public static void Update_img(Xoa_page page, Xog_js_wkr js_wkr, Xof_file_itm itm) {
+		Js_img_mgr.Update_img(page, js_wkr, itm.Html_img_wkr(), itm.Html_uid(), itm.Lnki_type(), itm.Html_elem_tid(), itm.Html_w(), itm.Html_h(), itm.Html_view_url()
+			, itm.Orig_w(), itm.Orig_h(), itm.Orig_ext(), itm.Html_orig_url(), itm.Orig_ttl(), itm.Html_gallery_mgr_h());
+	}
+	private static void Update_img(Xoa_page page, Xog_js_wkr js_wkr, Js_img_wkr img_wkr, int uid, byte lnki_type, byte elem_tid, int html_w, int html_h, Io_url html_view_url
+		, int orig_w, int orig_h, Xof_ext orig_ext, Io_url html_orig_url, byte[] lnki_ttl, int gallery_mgr_h) {
 		if (!page.Wiki().App().Mode().Tid_supports_js()) return;	// do not update html widget unless app is gui; null ref on http server; DATE:2014-09-17
 		switch (elem_tid) {
 			case Xof_html_elem.Tid_gallery_v2:
-				img_wkr.Js_wkr__update_hdoc(page, js_wkr, uid, html_w, html_h, html_view_url, orig_w, orig_h, html_orig_url, lnki_ttl);
+				img_wkr.Js_wkr__update_hdoc(page, js_wkr, uid, html_w, html_h, html_view_url, orig_w, orig_h, orig_ext, html_orig_url, lnki_ttl);
 				return;
 		}
 		String html_id = To_doc_uid(uid);
@@ -41,10 +43,10 @@ public class Js_img_mgr {
 		}
 		switch (elem_tid) {
 			case Xof_html_elem.Tid_gallery:
-				js_wkr.Html_atr_set("xowa_gallery_div3_" + uid, "style", "margin:" + Gallery_html_wtr_utl.Calc_vpad(gallery_mgr_h, html_h) + "px auto;");					
+				js_wkr.Html_atr_set("xowa_gallery_div3_" + uid, "style", "margin:" + Gallery_mgr_wtr_.Calc_vpad(gallery_mgr_h, html_h) + "px auto;");					
 				break;
 			case Xof_html_elem.Tid_imap:
-				img_wkr.Js_wkr__update_hdoc(page, js_wkr, uid, html_w, html_h, html_view_url, orig_w, orig_h, html_orig_url, lnki_ttl);
+				img_wkr.Js_wkr__update_hdoc(page, js_wkr, uid, html_w, html_h, html_view_url, orig_w, orig_h, orig_ext, html_orig_url, lnki_ttl);
 				break;
 			case Xof_html_elem.Tid_vid:
 				String html_id_vid = "xowa_file_play_" + uid;
diff --git a/400_xowa/src/gplx/xowa/files/gui/Js_img_wkr.java b/400_xowa/src/gplx/xowa/guis/cbks/js/Js_img_wkr.java
similarity index 75%
rename from 400_xowa/src/gplx/xowa/files/gui/Js_img_wkr.java
rename to 400_xowa/src/gplx/xowa/guis/cbks/js/Js_img_wkr.java
index 389897471..698204b77 100644
--- a/400_xowa/src/gplx/xowa/files/gui/Js_img_wkr.java
+++ b/400_xowa/src/gplx/xowa/guis/cbks/js/Js_img_wkr.java
@@ -15,8 +15,9 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa.files.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
-import gplx.xowa.guis.views.*;
+package gplx.xowa.guis.cbks.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.cbks.*;
+import gplx.xowa.files.*;
 public interface Js_img_wkr {
-	void Js_wkr__update_hdoc(Xoa_page page, Xog_js_wkr js_wkr, int html_uid, int html_w, int html_h, Io_url html_view_url, int orig_w, int orig_h, Io_url html_orig_url, byte[] lnki_ttl);
+	void Js_wkr__update_hdoc(Xoa_page page, Xog_js_wkr js_wkr, int html_uid, int html_w, int html_h, Io_url html_view_url
+		, int orig_w, int orig_h, Xof_ext orig_ext, Io_url html_orig_url, byte[] lnki_ttl);
 }
diff --git a/400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr.java b/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr.java
similarity index 89%
rename from 400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr.java
rename to 400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr.java
index 524cdbf7b..50e7f751c 100644
--- a/400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr.java
+++ b/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa.files.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
+package gplx.xowa.guis.cbks.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.cbks.*;
 public interface Xog_js_wkr {
 	void Html_img_update				(String uid, String src, int w, int h);
 	void Html_redlink					(String html_uid);
diff --git a/400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr_.java b/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr_.java
similarity index 90%
rename from 400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr_.java
rename to 400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr_.java
index 5d95ee5d8..c36878187 100644
--- a/400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr_.java
+++ b/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr_.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa.files.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
+package gplx.xowa.guis.cbks.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.cbks.*;
 public class Xog_js_wkr_ {
 	public static final    Xog_js_wkr Noop = new Xog_js_wkr__noop();
 }
diff --git a/400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr__log.java b/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr__log.java
similarity index 94%
rename from 400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr__log.java
rename to 400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr__log.java
index 300d8e7c3..cba4a27bd 100644
--- a/400_xowa/src/gplx/xowa/files/gui/Xog_js_wkr__log.java
+++ b/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr__log.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa.files.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
+package gplx.xowa.guis.cbks.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.cbks.*;
 public class Xog_js_wkr__log implements Xog_js_wkr {
 	private final    List_adp log_list = List_adp_.New();
 	public void Html_img_update			(String uid, String src, int w, int h)	{log_list.Add(Object_.Ary(Proc_img_update, uid, src, w, h));}
diff --git a/400_xowa/src/gplx/xowa/guis/urls/Xog_url_wkr.java b/400_xowa/src/gplx/xowa/guis/urls/Xog_url_wkr.java
index 0a5fae2db..46f874547 100644
--- a/400_xowa/src/gplx/xowa/guis/urls/Xog_url_wkr.java
+++ b/400_xowa/src/gplx/xowa/guis/urls/Xog_url_wkr.java
@@ -75,7 +75,7 @@ public class Xog_url_wkr {
 		Xof_fsdb_itm fsdb = Xof_orig_file_downloader.Make_fsdb(wiki, lnki_ttl, img_size, url_bldr);
 		if (!Io_mgr.Instance.ExistsFil(href_url)) {
 //				if (!Xof_orig_file_downloader.Get_to_url(fsdb, href_url, wiki, lnki_ttl, url_bldr))
-			if (!Xof_file_wkr.Show_img(fsdb, Xoa_app_.Usr_dlg(), wiki.File__bin_mgr(), wiki.File__mnt_mgr(), wiki.App().User().User_db_mgr().Cache_mgr(), wiki.File__repo_mgr(), gplx.xowa.files.gui.Xog_js_wkr_.Noop, img_size, url_bldr, page))
+			if (!Xof_file_wkr.Show_img(fsdb, Xoa_app_.Usr_dlg(), wiki.File__bin_mgr(), wiki.File__mnt_mgr(), wiki.App().User().User_db_mgr().Cache_mgr(), wiki.File__repo_mgr(), gplx.xowa.guis.cbks.js.Xog_js_wkr_.Noop, img_size, url_bldr, page))
 				return Rslt_handled;
 		}
 		gplx.core.ios.IoItmFil fil = Io_mgr.Instance.QueryFil(href_url);
diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_async_wkr.java b/400_xowa/src/gplx/xowa/guis/views/Xog_async_wkr.java
index 0b90325f0..16af1b985 100644
--- a/400_xowa/src/gplx/xowa/guis/views/Xog_async_wkr.java
+++ b/400_xowa/src/gplx/xowa/guis/views/Xog_async_wkr.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.guis.views; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*;
 import gplx.core.threads.*;
 import gplx.xowa.wikis.pages.lnkis.*;
-import gplx.xowa.files.gui.*;
+import gplx.xowa.guis.cbks.js.*;
 public class Xog_async_wkr {
 	public static void Async(Xog_tab_itm tab) {Xog_async_wkr.Async(tab.Page(), tab.Html_itm());}
 	public static void Async(Xoae_page page, Xog_html_itm js_wkr) {
diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_html_itm.java b/400_xowa/src/gplx/xowa/guis/views/Xog_html_itm.java
index 7581d5a6a..f2755e144 100644
--- a/400_xowa/src/gplx/xowa/guis/views/Xog_html_itm.java
+++ b/400_xowa/src/gplx/xowa/guis/views/Xog_html_itm.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.guis.views; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*;
 import gplx.core.primitives.*; import gplx.core.btries.*;
 import gplx.gfui.*; import gplx.gfui.kits.core.*; import gplx.gfui.controls.elems.*; import gplx.gfui.controls.standards.*;
-import gplx.xowa.guis.menus.*; import gplx.xowa.guis.menus.dom.*; import gplx.xowa.files.gui.*;
+import gplx.xowa.guis.menus.*; import gplx.xowa.guis.menus.dom.*; import gplx.xowa.guis.cbks.js.*;
 import gplx.langs.htmls.*; import gplx.xowa.htmls.hrefs.*; import gplx.xowa.htmls.js.*; import gplx.xowa.htmls.heads.*; import gplx.xowa.wikis.pages.*;
 public class Xog_html_itm implements Xog_js_wkr, Gfo_invk, Gfo_evt_itm {
 	private Xoae_app app; private final    Object thread_lock = new Object();
@@ -33,12 +33,12 @@ public class Xog_html_itm implements Xog_js_wkr, Gfo_invk, Gfo_evt_itm {
 		cmd_async = kit.New_cmd_async(this);
 		ev_mgr = new Gfo_evt_mgr(this);
 	}
-	public Gfo_evt_mgr			Evt_mgr() {return ev_mgr;} private Gfo_evt_mgr ev_mgr;
+	public Gfo_evt_mgr		Evt_mgr() {return ev_mgr;} private Gfo_evt_mgr ev_mgr;
 	public Xog_tab_itm		Owner_tab() {return owner_tab;} private Xog_tab_itm owner_tab;
 	public Gfui_html		Html_box() {return html_box;} private Gfui_html html_box;
 	public Xoh_js_cbk		Js_cbk() {return js_cbk;} private Xoh_js_cbk js_cbk;
-	public Gfo_invk		Cmd_sync() {return cmd_sync;} private Gfo_invk cmd_sync;
-	public Gfo_invk		Cmd_async() {return cmd_async;} private Gfo_invk cmd_async; 
+	public Gfo_invk			Cmd_sync() {return cmd_sync;} private Gfo_invk cmd_sync;
+	public Gfo_invk			Cmd_async() {return cmd_async;} private Gfo_invk cmd_async; 
 	public void Switch_mem(Xog_html_itm comp) {
 		Xog_tab_itm temp_owner_tab = owner_tab;		// NOTE: reparent owner_tab, since owner_tab will be switching its html_itm
 		this.owner_tab = comp.owner_tab;
@@ -47,6 +47,7 @@ public class Xog_html_itm implements Xog_js_wkr, Gfo_invk, Gfo_evt_itm {
 	public void Html_box_(Gfui_html html_box) {
 		this.html_box = html_box;
 		html_box.Html_js_cbks_add("xowa_exec", js_cbk);
+		Gfo_evt_mgr_.Sub_same(html_box, Gfui_html.Evt_zoom_changed, this);
 	}
 	public String Html_selected_get_src_or_empty()			{return html_box.Html_js_eval_proc_as_str(Xog_js_procs.Selection__get_src_or_empty);}
 	public String Html_selected_get_href_or_text()			{return Html_extract_text(html_box.Html_js_eval_proc_as_str(Xog_js_procs.Selection__get_href_or_text));}
@@ -188,6 +189,9 @@ public class Xog_html_itm implements Xog_js_wkr, Gfo_invk, Gfo_evt_itm {
 			popup_mnu = popup_mnu_mgr.Html_link();
 		kit.Set_mnu_popup(html_box, popup_mnu.Under_mnu());
 	}
+	private void When_zoom_changed(boolean clicks_is_positive) {
+		app.Api_root().Gui().Font().Adj(clicks_is_positive ? 1 : -1);
+	}
 	public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
 		if		(ctx.Match(k, Invk_html_img_update))					html_box.Html_js_eval_proc_as_bool	(Xog_js_procs.Doc__elem_img_update		, m.ReadStr("elem_id"), m.ReadStr("elem_src"), m.ReadInt("elem_width"), m.ReadInt("elem_height"));
 		else if	(ctx.Match(k, Invk_html_elem_atr_set))					html_box.Html_js_eval_proc_as_str	(Xog_js_procs.Doc__atr_set				, m.ReadStr("elem_id"), m.ReadStr("atr_key"), m.ReadStr("atr_val"));
@@ -201,6 +205,7 @@ public class Xog_html_itm implements Xog_js_wkr, Gfo_invk, Gfo_evt_itm {
 		else if (ctx.Match(k, Invk_scroll_page_by_id))					Scroll_page_by_id(m.ReadStr("v"));
 		else if (ctx.Match(k, Invk_html_elem_focus))					html_box.Html_js_eval_proc_as_str(Xog_js_procs.Doc__elem_focus, m.ReadStr("v"));
 		else if (ctx.Match(k, GfuiElemKeys.Evt_menu_detected))			When_menu_detected();
+		else if	(ctx.Match(k, Gfui_html.Evt_zoom_changed))				When_zoom_changed(m.ReadBool("clicks_is_positive"));
 		else	return Gfo_invk_.Rv_unhandled;
 		return this;
 	}
diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_layout.java b/400_xowa/src/gplx/xowa/guis/views/Xog_layout.java
index b6104bacf..b754ca9d7 100644
--- a/400_xowa/src/gplx/xowa/guis/views/Xog_layout.java
+++ b/400_xowa/src/gplx/xowa/guis/views/Xog_layout.java
@@ -79,6 +79,7 @@ public class Xog_layout implements Gfo_invk {
 		find_bwd_btn.Adj_text(win.Find_bwd_btn());
 		prog_box.Adj_text(win.Prog_box());
 		note_box.Adj_text(win.Info_box());
+		win.Tab_mgr().Tab_mgr().TextMgr().Font_(win.Url_box().TextMgr().Font());
 		Visible_(false, win.Find_box(), win.Find_bwd_btn(), win.Find_fwd_btn(), win.Find_close_btn());
 	}	private Xog_win_itm win;
 	public int Box_height_calc(Gfui_kit kit, GfuiElem url_box) {
diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_layout_box.java b/400_xowa/src/gplx/xowa/guis/views/Xog_layout_box.java
index 1c45fae27..3bbf833c6 100644
--- a/400_xowa/src/gplx/xowa/guis/views/Xog_layout_box.java
+++ b/400_xowa/src/gplx/xowa/guis/views/Xog_layout_box.java
@@ -32,6 +32,7 @@ public class Xog_layout_box implements Gfo_invk {
 	public float Font_size() {return font_size;} public Xog_layout_box Font_size_(float v) {font_size = v; return this;} float font_size = Float_.NaN;
 	public FontStyleAdp Font_style() {return font_style;} public Xog_layout_box Font_style_(FontStyleAdp v) {font_style = v; return this;} FontStyleAdp font_style;
 	public byte Mode() {return mode;} public Xog_layout_box Mode_(byte v) {mode = v; return this;} private byte mode = Mode_rel;
+	public FontAdp To_font() {return Font_make(font_name, font_size, font_style);}
 	public void Adj_size(Rect_ref rect) {
 		if (w_abs > -1) rect.W_(w_abs);	if (w_rel != Int_.Min_value) rect.W_(w_rel + rect.W());
 		if (h_abs > -1) rect.H_(h_abs);	if (h_rel != Int_.Min_value) rect.H_(h_rel + rect.H());
@@ -74,7 +75,7 @@ public class Xog_layout_box implements Gfo_invk {
 		, Invk_size_abs_ = "size_abs_", Invk_pos_abs_ = "pos_abs_", Invk_rect_abs_ = "rect_abs_", Invk_size_rel_ = "size_rel_", Invk_pos_rel_ = "pos_rel_", Invk_rect_rel_ = "rect_rel_"
 		, Invk_text_ = "text_"
 		, Invk_font_name_ = "font_name_", Invk_font_size_ = "font_size_", Invk_font_style_ = "font_style_", Invk_mode_ = "mode_", Invk_owner = "owner";
-	FontAdp Font_make(String font_name, float font_size, FontStyleAdp font_style) {
+	private static FontAdp Font_make(String font_name, float font_size, FontStyleAdp font_style) {
 		String new_font_name = font_name == null ? "Arial" : font_name;
 		float new_font_size = Float_.IsNaN(font_size) ? 8 : font_size;
 		FontStyleAdp new_font_style = font_style == null ? FontStyleAdp_.Plain : font_style;
diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java
index f38716e65..52320deff 100644
--- a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java
+++ b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java
@@ -197,7 +197,7 @@ public class Xog_tab_itm implements Gfo_invk {
 			this.tab_is_loading = false;
 		}
 	}
-	public void Exec_async_hdump(Xoa_app app, Xow_wiki wiki, gplx.xowa.files.gui.Xog_js_wkr js_wkr, gplx.core.threads.Gfo_thread_pool thread_pool, Xoa_page page, List_adp imgs, int[] redlink_ary) {
+	public void Exec_async_hdump(Xoa_app app, Xow_wiki wiki, gplx.xowa.guis.cbks.js.Xog_js_wkr js_wkr, gplx.core.threads.Gfo_thread_pool thread_pool, Xoa_page page, List_adp imgs, int[] redlink_ary) {
 		if (imgs.Count() > 0) {
 			Xof_file_wkr file_thread = new Xof_file_wkr
 				( wiki.File__orig_mgr(), wiki.File__bin_mgr(), wiki.File__mnt_mgr()
diff --git a/400_xowa/src/gplx/xowa/htmls/core/htmls/Xoh_html_wtr.java b/400_xowa/src/gplx/xowa/htmls/core/htmls/Xoh_html_wtr.java
index 8ddad6f70..b929ef8ab 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/htmls/Xoh_html_wtr.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/htmls/Xoh_html_wtr.java
@@ -72,7 +72,7 @@ public class Xoh_html_wtr {
 				break;
 			case Xop_tkn_itm_.Tid_ignore:			break;
 			case Xop_tkn_itm_.Tid_html_ncr:			Html_ncr(ctx, hctx, bfr, src, (Xop_amp_tkn_num)tkn); break;
-			case Xop_tkn_itm_.Tid_html_ref:			Html_ref(ctx, hctx, bfr, src, (Xop_amp_tkn_txt)tkn); break;
+			case Xop_tkn_itm_.Tid_html_ref:			Html_ref(ctx, hctx, bfr, src, (Xop_amp_tkn_ent)tkn); break;
 			case Xop_tkn_itm_.Tid_hr:				Hr(ctx, hctx, bfr, src, (Xop_hr_tkn)tkn); break;
 			case Xop_tkn_itm_.Tid_apos:				Apos(ctx, hctx, bfr, src, (Xop_apos_tkn)tkn); break;
 			case Xop_tkn_itm_.Tid_lnki:				lnki_wtr.Write_lnki(bfr, hctx, src, (Xop_lnki_tkn)tkn); break;
@@ -101,7 +101,7 @@ public class Xoh_html_wtr {
 	public void Html_ncr(Xop_ctx ctx, Xoh_wtr_ctx hctx, Bry_bfr bfr, byte[] src, Xop_amp_tkn_num tkn)	{
 		bfr.Add_byte(Byte_ascii.Amp).Add_byte(Byte_ascii.Hash).Add_int_variable(tkn.Val()).Add_byte(Byte_ascii.Semic);	// NOTE: do not literalize, else browser may not display multi-char bytes properly; EX: &#160; gets added as &#160; not as {192,160}; DATE:2013-12-09
 	}
-	public void Html_ref(Xop_ctx ctx, Xoh_wtr_ctx hctx, Bry_bfr bfr, byte[] src, Xop_amp_tkn_txt tkn) {
+	public void Html_ref(Xop_ctx ctx, Xoh_wtr_ctx hctx, Bry_bfr bfr, byte[] src, Xop_amp_tkn_ent tkn) {
 		if (tkn.Itm_is_custom())	// used by <nowiki>; EX:<nowiki>&#60;</nowiki> -> &xowa_lt; DATE:2014-11-07
 			tkn.Print_literal(bfr);
 		else
diff --git a/400_xowa/src/gplx/xowa/htmls/core/htmls/Xoh_html_wtr_escaper.java b/400_xowa/src/gplx/xowa/htmls/core/htmls/Xoh_html_wtr_escaper.java
index 904cd12dc..a807cdfc0 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/htmls/Xoh_html_wtr_escaper.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/htmls/Xoh_html_wtr_escaper.java
@@ -62,14 +62,15 @@ public class Xoh_html_wtr_escaper {
 									i = match_pos - 1;
 									break;
 								case Xop_amp_trie_itm.Tid_num_dec:
-								case Xop_amp_trie_itm.Tid_num_hex:			// ncr: dec/hex
-									boolean pass = amp_mgr.Parse_as_int(itm_tid == Xop_amp_trie_itm.Tid_num_hex, src, end, i, match_pos);
-									int end_pos = amp_mgr.Rslt_pos();
-									if (pass) {								// parse worked; embed entire ncr
+								case Xop_amp_trie_itm.Tid_num_hex:			// ncr: dec/hex; escape if invalid
+									Xop_amp_mgr_rslt rslt = new Xop_amp_mgr_rslt();
+									boolean pass = amp_mgr.Parse_ncr(rslt, itm_tid == Xop_amp_trie_itm.Tid_num_hex, src, end, i, match_pos);
+									if (pass) {								// parse worked; embed entire ncr; EX: "&#123;"
+										int end_pos = rslt.Pos();
 										bfr.Add_mid(src, i, end_pos);
 										i = end_pos - 1;
 									}
-									else									// parse failed; escape and continue
+									else									// parse failed; escape and continue; EX: "&#a!b;"
 										bfr.Add(Gfh_entity_.Amp_bry);
 									break;
 								default: throw Err_.new_unhandled(itm_tid);
diff --git a/400_xowa/src/gplx/xowa/htmls/core/makes/Xoh_make_mgr.java b/400_xowa/src/gplx/xowa/htmls/core/makes/Xoh_make_mgr.java
index 638cd59d4..0fb595b44 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/makes/Xoh_make_mgr.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/makes/Xoh_make_mgr.java
@@ -106,26 +106,26 @@ public class Xoh_make_mgr {
 				case Xoh_make_trie_.Tid__gallery_box_max: {
 					Xohd_img_itm__gallery_mgr gly = (Xohd_img_itm__gallery_mgr)hpg.Gallery_itms().Get_by(uid);
 					if (gly != null) {	// -1 means no box_max
-						byte[] style = Gallery_html_wtr_.Fmtr__ul__style.Bld_bry_many(tmp_bfr, gly.Box_max());
+						byte[] style = Gallery_mgr_wtr_.Fmtr__ul__style.Bld_bry_many(tmp_bfr, gly.Box_max());
 						Gfh_wtr.Write_atr_bry(bfr, Bool_.N, Byte_ascii.Quote, Gfh_atr_.Bry__style, style);
 					}
 					return rv;
 				}
 				case Xoh_make_trie_.Tid__gallery_box_w: {
 					Xohd_img_itm__gallery_itm gly = (Xohd_img_itm__gallery_itm)img;
-					byte[] style = Gallery_html_wtr_.hdump_box_w_fmtr.Bld_bry_many(tmp_bfr, gly.Box_w());
+					byte[] style = Gallery_mgr_wtr_.hdump_box_w_fmtr.Bld_bry_many(tmp_bfr, gly.Box_w());
 					Gfh_wtr.Write_atr_bry(bfr, Bool_.N, Byte_ascii.Quote, Gfh_atr_.Bry__style, style);
 					return rv;
 				}
 				case Xoh_make_trie_.Tid__gallery_img_w: {
 					Xohd_img_itm__gallery_itm gly = (Xohd_img_itm__gallery_itm)img;
-					byte[] style = Gallery_html_wtr_.hdump_box_w_fmtr.Bld_bry_many(tmp_bfr, gly.Img_w());
+					byte[] style = Gallery_mgr_wtr_.hdump_box_w_fmtr.Bld_bry_many(tmp_bfr, gly.Img_w());
 					Gfh_wtr.Write_atr_bry(bfr, Bool_.N, Byte_ascii.Quote, Gfh_atr_.Bry__style, style);
 					return rv;
 				}
 				case Xoh_make_trie_.Tid__gallery_img_pad: {
 					Xohd_img_itm__gallery_itm gly = (Xohd_img_itm__gallery_itm)img;
-					byte[] style = Gallery_html_wtr_.hdump_img_pad_fmtr.Bld_bry_many(tmp_bfr, gly.Img_pad());
+					byte[] style = Gallery_mgr_wtr_.hdump_img_pad_fmtr.Bld_bry_many(tmp_bfr, gly.Img_pad());
 					Gfh_wtr.Write_atr_bry(bfr, Bool_.N, Byte_ascii.Quote, Gfh_atr_.Bry__style, style);
 					return rv;
 				}
diff --git a/400_xowa/src/gplx/xowa/htmls/core/makes/Xoh_make_trie_.java b/400_xowa/src/gplx/xowa/htmls/core/makes/Xoh_make_trie_.java
index 86a3a4dda..243d9b29b 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/makes/Xoh_make_trie_.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/makes/Xoh_make_trie_.java
@@ -23,7 +23,7 @@ public class Xoh_make_trie_ {
 	, Tid__hiero_dir = 7, Tid__gallery_box_max = 8, Tid__gallery_box_w = 9, Tid__gallery_img_w = 10, Tid__gallery_img_pad = 11
 	, Tid__toc = 12, Tid__hdr = 13
 	;
-	public static final byte[]
+	public static final    byte[]
 	  Bry__dir						= Bry_.new_a7("~{xowa_dir}")
 	, Bry__img						= Bry_.new_a7("xowa_img=\"")
 	, Bry__img_style				= Bry_.new_a7("xowa_img_style=\"")
@@ -37,7 +37,7 @@ public class Xoh_make_trie_ {
 //		, Bry__gallery_img_pad			= Bry_.new_a7("xowa_gly_img_pad='")
 	, Bry__toc						= Bry_.new_a7("~{xowa_toc}")
 	;
-	public static final byte[]
+	public static final    byte[]
 	  A_href_bgn				= Bry_.new_a7("/wiki/File:")
 	, Bry_img_style_bgn			= Bry_.new_a7("style='width:")
 	, Bry_img_style_end			= Bry_.new_a7("px;'")
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/bfr_args/Bfr_arg__hatr_id.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/bfr_args/Bfr_arg__hatr_id.java
index 1cfcebfb7..acb860778 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/bfr_args/Bfr_arg__hatr_id.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/bfr_args/Bfr_arg__hatr_id.java
@@ -22,6 +22,7 @@ public class Bfr_arg__hatr_id implements Bfr_arg_clearable {
 	private final    byte[] bry; private int num;
 	public Bfr_arg__hatr_id(byte[] atr_key, byte[] bry)	{this.bry = bry; this.atr_bgn = Bfr_arg__hatr_.Bld_atr_bgn(atr_key);}
 	public Bfr_arg__hatr_id Set(int num)				{this.num = num; return this;}
+	public byte[] Get_id_val()							{return Bry_.Add(bry, Int_.To_bry(num));}
 	public void Bfr_arg__clear()						{num = -1;}
 	public boolean Bfr_arg__missing()						{return num == -1;}
 	public void Bfr_arg__add(Bry_bfr bfr) {
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__elem__capt.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__elem__capt.java
new file mode 100644
index 000000000..745752fee
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__elem__capt.java
@@ -0,0 +1,38 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.core.wkrs.glys; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
+import gplx.langs.htmls.*;
+class Bfr_arg__elem__capt implements gplx.core.brys.Bfr_arg_clearable {
+	private byte[] capt;
+	public Bfr_arg__elem__capt() {
+		this.Clear();
+	}
+	public void Capt_(byte[] v) {this.capt = v;}
+	public void Clear() {capt = null;}
+	public void Bfr_arg__clear() {this.Clear();}
+	public boolean Bfr_arg__missing() {return capt == null;}
+	public void Bfr_arg__add(Bry_bfr bfr) {		// EX: '\n<li class="gallerycaption">Z</li>'
+		if (Bfr_arg__missing()) return;
+		bfr.Add_byte_nl();
+		bfr.Add(Gfh_tag_.Li_lhs_bgn);			// '<li'
+		Gfh_atr_.Add(bfr, Gfh_atr_.Bry__class, Xoh_gly_grp_data.Atr__cls__gallerycaption);	// ' class="gallerycaption"'
+		bfr.Add_byte(Byte_ascii.Angle_end);		// '>'
+		bfr.Add(capt);
+		bfr.Add(Gfh_tag_.Li_rhs);				// '</li>'
+	}
+}
\ No newline at end of file
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__hatr__style.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__hatr__style.java
new file mode 100644
index 000000000..6cca60c9f
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__hatr__style.java
@@ -0,0 +1,56 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.core.wkrs.glys; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
+import gplx.xowa.htmls.core.wkrs.bfr_args.*;
+class Bfr_arg__hatr__style implements gplx.core.brys.Bfr_arg {
+	private final    byte[] atr_bgn;
+	private int max_w, w;
+	private byte[] xtra_cls;
+	public Bfr_arg__hatr__style(byte[] key) {
+		this.atr_bgn = Bfr_arg__hatr_.Bld_atr_bgn(key);
+		this.Clear();
+	}
+	public void Set_args(int max_w, int w, byte[] xtra_cls) {this.max_w = max_w; this.w = w; this.xtra_cls = xtra_cls;}
+	public void Clear() {max_w = 0; w = 0; xtra_cls = null;}
+	public void Bfr_arg__clear() {this.Clear();}
+	public boolean Bfr_arg__missing() {return max_w == 0 && xtra_cls == null;}
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		if (Bfr_arg__missing()) return;
+		bfr.Add(atr_bgn);
+		if (max_w > 0) {
+			bfr.Add(Style__frag_1);
+			bfr.Add_int_variable(max_w);
+			bfr.Add(Style__frag_3);
+		}
+		if (w > 0) {
+			bfr.Add_byte_space();
+			bfr.Add(Style__frag_2);
+			bfr.Add_int_variable(w);
+			bfr.Add(Style__frag_3);
+		}
+		if (xtra_cls != null) {
+			bfr.Add(xtra_cls);
+		}
+		bfr.Add_byte_quote();
+	}
+	private static final    byte[]
+	  Style__frag_1 = Bry_.new_a7("max-width:")
+	, Style__frag_2 = Bry_.new_a7("_width:")
+	, Style__frag_3 = Bry_.new_a7("px;")
+	;
+}
\ No newline at end of file
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__hatr__xogly.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__hatr__xogly.java
new file mode 100644
index 000000000..61ffe19c9
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Bfr_arg__hatr__xogly.java
@@ -0,0 +1,41 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.core.wkrs.glys; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
+import gplx.xowa.htmls.core.wkrs.bfr_args.*;
+class Bfr_arg__hatr__xogly implements gplx.core.brys.Bfr_arg_clearable {
+	private final    byte[] atr_bgn;
+	private int xnde_w, xnde_h, xnde_per_row;
+	public Bfr_arg__hatr__xogly() {
+		this.atr_bgn = Bfr_arg__hatr_.Bld_atr_bgn(gplx.xowa.xtns.gallery.Gallery_mgr_wtr.Bry__data_xogly);
+		this.Clear();
+	}
+	public void Set_args(int xnde_w, int xnde_h, int xnde_per_row) {
+		this.xnde_w = xnde_w; this.xnde_h = xnde_h; this.xnde_per_row = xnde_per_row;
+	}
+	public void Clear() {xnde_w = xnde_h = xnde_per_row = -1;}
+	public void Bfr_arg__clear() {this.Clear();}
+	public boolean Bfr_arg__missing() {return false;} // NOTE: do not check if "xnde_w == -1 && xnde_h == -1 && xnde_per_row == -1" else will fail hzip diff; DATE:2016-07-02
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		if (Bfr_arg__missing()) return;
+		bfr.Add(atr_bgn);
+		bfr.Add_int_variable(xnde_w).Add_byte_pipe();
+		bfr.Add_int_variable(xnde_h).Add_byte_pipe();
+		bfr.Add_int_variable(xnde_per_row);
+		bfr.Add_byte_quote();
+	}
+}
\ No newline at end of file
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_data.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_data.java
index c7435e6e5..43326484a 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_data.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_data.java
@@ -22,31 +22,38 @@ import gplx.xowa.htmls.core.hzips.*;
 import gplx.xowa.xtns.gallery.*;
 public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr {	// FUTURE:add gallerycaption
 	private final    List_adp itms_list = List_adp_.New();
-	public int Src_bgn() {return src_bgn;} private int src_bgn;
-	public int Src_end() {return src_end;} private int src_end;
-	public int Gly_tid() {return gly_tid;} private int gly_tid;
-	public int Ul_style_max_w() {return ul_style_max_w;} private int ul_style_max_w;
-	public int Ul_style_w() {return ul_style_w;} private int ul_style_w;
-	public int Xtra_atr_bgn() {return xtra_atr_bgn;} private int xtra_atr_bgn;
-	public int Xtra_atr_end() {return xtra_atr_end;} private int xtra_atr_end;
-	public boolean Xtra_atr_exists() {return xtra_atr_end > xtra_atr_bgn;}
-	public int Xtra_cls_bgn() {return xtra_cls_bgn;} private int xtra_cls_bgn;
-	public int Xtra_cls_end() {return xtra_cls_end;} private int xtra_cls_end;
-	public boolean Xtra_cls_exists() {return xtra_cls_end > xtra_cls_bgn;}
-	public int Xtra_style_bgn() {return xtra_style_bgn;} private int xtra_style_bgn;
-	public int Xtra_style_end() {return xtra_style_end;} private int xtra_style_end;
-	public boolean Xtra_style_exists() {return xtra_style_end > xtra_style_bgn;}
-	public int Itms__len() {return itms_list.Count();}
+	public int				Src_bgn() {return src_bgn;} private int src_bgn;
+	public int				Src_end() {return src_end;} private int src_end;
+	public int				Gly_tid() {return gly_tid;} private int gly_tid;
+	public int				Xnde_w() {return xnde_w;} private int xnde_w;
+	public int				Xnde_h() {return xnde_h;} private int xnde_h;
+	public int				Xnde_per_row() {return xnde_per_row;} private int xnde_per_row;
+	public int				Ul_style_max_w() {return ul_style_max_w;} private int ul_style_max_w;
+	public int				Ul_style_w() {return ul_style_w;} private int ul_style_w;
+	public int				Xtra_atr_bgn() {return xtra_atr_bgn;} private int xtra_atr_bgn;
+	public int				Xtra_atr_end() {return xtra_atr_end;} private int xtra_atr_end;
+	public boolean				Xtra_atr_exists() {return xtra_atr_end > xtra_atr_bgn;}
+	public int				Xtra_cls_bgn() {return xtra_cls_bgn;} private int xtra_cls_bgn;
+	public int				Xtra_cls_end() {return xtra_cls_end;} private int xtra_cls_end;
+	public boolean				Xtra_cls_exists() {return xtra_cls_end > xtra_cls_bgn;}
+	public int				Xtra_style_bgn() {return xtra_style_bgn;} private int xtra_style_bgn;
+	public int				Xtra_style_end() {return xtra_style_end;} private int xtra_style_end;
+	public boolean				Xtra_style_exists() {return xtra_style_end > xtra_style_bgn;}
+	public int				Capt_bgn() {return capt_bgn;} private int capt_bgn;
+	public int				Capt_end() {return capt_end;} private int capt_end;
+	public int				Itms__len() {return itms_list.Count();}
 	public Xoh_gly_itm_data Itms__get_at(int i) {return (Xoh_gly_itm_data)itms_list.Get_at(i);}
 	private void Clear() {
 		this.gly_tid = Byte_.Max_value_127;
 		this.ul_style_max_w = ul_style_w = 0;
 		this.xtra_atr_bgn = xtra_atr_end = xtra_cls_bgn = xtra_cls_end = xtra_style_bgn = xtra_style_end = -1;
+		this.xnde_per_row = xnde_w = xnde_h = capt_bgn = capt_end = -1;
 		itms_list.Clear();
 	}
 	public boolean Parse1(Xoh_hdoc_wkr hdoc_wkr, Xoh_hdoc_ctx hctx, byte[] src, Gfh_tag_rdr tag_rdr, Gfh_tag ul_head) {
 		this.Clear();
 		this.src_bgn = ul_head.Src_bgn();
+		if (!Parse_xogly(src, tag_rdr, ul_head)) return false;
 		if (!Parse_cls  (src, tag_rdr, ul_head)) return false;
 		if (!Parse_style(src, tag_rdr, ul_head)) return false;
 		Parse_ul_atrs(src, tag_rdr, ul_head);
@@ -55,10 +62,16 @@ public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr {	/
 			li_head = tag_rdr.Tag__peek_fwd_head();
 			if (li_head.Name_id() != Gfh_tag_.Id__li) break;	// no more <li>; break;
 			// FUTURE: galleries with gallerycaption will cause gallery to write raw; instate code below, but would need to then serialize "gallerycaption"; PAGE:en.d:A DATE:2016-06-24
-			// if (li_head.Atrs__cls_has(Atr__cls__gallerycaption)) {// skip <li class='gallerycaption'>A</li>
-			//	li_head = tag_rdr.Tag__move_fwd_head();
-			//	li_head = tag_rdr.Tag__peek_fwd_head();	
-			// }
+			if (li_head.Atrs__cls_has(Atr__cls__gallerycaption)) {// skip <li class='gallerycaption'>A</li>
+				// extract caption between <li></li>
+				li_head = tag_rdr.Tag__move_fwd_head();
+				this.capt_bgn = li_head.Src_end();
+				Gfh_tag li_tail = tag_rdr.Tag__move_fwd_tail(li_head.Name_id());
+				this.capt_end = li_tail.Src_bgn();
+
+				// move tag_rdr to next <li>
+				li_head = tag_rdr.Tag__peek_fwd_head();
+			}
 			if (!li_head.Atrs__cls_has(Atr__cls__gallerybox)) return false;
 			tag_rdr.Pos_(li_head.Src_end());
 			Xoh_gly_itm_data itm_parser = new Xoh_gly_itm_data();
@@ -71,6 +84,25 @@ public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr {	/
 		hdoc_wkr.On_gly(this);
 		return true;
 	}
+	private boolean Parse_xogly(byte[] src, Gfh_tag_rdr tag_rdr, Gfh_tag ul_head) {
+		Gfh_atr atr = ul_head.Atrs__get_by_or_empty(Gallery_mgr_wtr.Bry__data_xogly);
+		byte[] val = atr.Val(); int val_len = val.length;
+		if (val_len == 0) return true;	// ignore missing "data-xogly"
+		int pos = 0;
+		for (int i = 0; i < 3; ++i) {
+			int bgn = pos;
+			int end = Bry_find_.Find_fwd(val, Byte_ascii.Pipe, bgn + 1, val_len);
+			if (end == Bry_find_.Not_found) end = val_len;
+			int num = Bry_.To_int_or(val, bgn, end, -1);
+			pos = end + 1;
+			switch (i) {
+				case 0: xnde_w = num; break;
+				case 1: xnde_h = num; break;
+				case 2: xnde_per_row = num; break;
+			}
+		}
+		return true;
+	}
 	private boolean Parse_cls(byte[] src, Gfh_tag_rdr tag_rdr, Gfh_tag ul_head) {
 		Gfh_atr ul_cls = ul_head.Atrs__get_by_or_empty(Gfh_atr_.Bry__class);
 		Gfh_class_parser_.Parse(src, ul_cls.Val_bgn(), ul_cls.Val_end(), this);
@@ -89,9 +121,7 @@ public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr {	/
 		int atrs_len = ul_head.Atrs__len();
 		for (int i = 0; i < atrs_len; ++i) {
 			Gfh_atr hatr = ul_head.Atrs__get_at(i);
-			if		(Bry_.Eq(hatr.Key(), Gfh_atr_.Bry__class)) {}
-			else if (Bry_.Eq(hatr.Key(), Gfh_atr_.Bry__style)) {}
-			else {
+			if (atrs_ignored.Get_by_bry(hatr.Key()) == null) {
 				if (xtra_atr_bgn == -1) this.xtra_atr_bgn = hatr.Atr_bgn();
 				this.xtra_atr_end = hatr.Atr_end();
 			}
@@ -104,7 +134,7 @@ public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr {	/
 		else if (Bry_.Match(src, val_bgn, val_bgn + Atr__cls__mw_gallery.length, Atr__cls__mw_gallery)	// starts with 'mw-gallery-'
 				&&	val_pos == 8) {											// occurs after "gallery "
 			int tid_bgn = val_bgn + Atr__cls__mw_gallery.length;
-			this.gly_tid = Gallery_mgr_base_.Hash.Get_as_byte_or(src, tid_bgn, val_end, Byte_.Max_value_127);
+			this.gly_tid = Gallery_mgr_base_.To_tid_or(src, tid_bgn, val_end, Byte_.Max_value_127);
 			return true;
 		}
 		else {
@@ -135,8 +165,16 @@ public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr {	/
 		return true;
 	}
 	public static final    byte[] Atr__cls__gallery = Bry_.new_a7("gallery");
-	private static final    byte[] Atr__cls__mw_gallery = Bry_.new_a7("mw-gallery-"), Atr__cls__gallerybox = Bry_.new_a7("gallerybox")
-	// , Atr__cls__gallerycaption = Bry_.new_a7("gallerycaption")
+	private static final    byte[] Atr__cls__mw_gallery = Bry_.new_a7("mw-gallery-"), Atr__cls__gallerybox = Bry_.new_a7("gallerybox")		
 	, Style__max_width = Bry_.new_a7("max-width"), Style___width = Bry_.new_a7("_width")
 	;
+	public static final    byte[] Atr__cls__gallerycaption = Bry_.new_a7("gallerycaption");
+	private static final    Hash_adp_bry atrs_ignored = Make_atrs_ignored();
+	private static Hash_adp_bry Make_atrs_ignored() {
+		Hash_adp_bry rv = Hash_adp_bry.ci_a7();
+		rv.Add_as_key_and_val(Gfh_atr_.Bry__class);
+		rv.Add_as_key_and_val(Gfh_atr_.Bry__style);
+		rv.Add_as_key_and_val(Gallery_mgr_wtr.Bry__data_xogly);
+		return rv;
+	}
 }
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_wtr.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_wtr.java
index 46f952348..28a994bca 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_wtr.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_wtr.java
@@ -20,21 +20,26 @@ import gplx.core.brys.*; import gplx.core.brys.fmtrs.*;
 import gplx.langs.htmls.*; import gplx.xowa.htmls.core.wkrs.bfr_args.*;
 class Xoh_gly_grp_wtr implements Bfr_arg {
 	private final    Bfr_arg_clearable[] arg_ary;
-	private final    Bfr_arg__hatr_id ul_id = Bfr_arg__hatr_id.New_id("xogly_li_");
-	private final    Bfr_arg__hatr_gly_style ul_style = new Bfr_arg__hatr_gly_style(Gfh_atr_.Bry__style);
+	private final    Bfr_arg__hatr_id ul_id = Bfr_arg__hatr_id.New_id("xogly_ul_");
+	private final    Bfr_arg__hatr__style ul_style = new Bfr_arg__hatr__style(Gfh_atr_.Bry__style);
+	private final    Bfr_arg__hatr__xogly ul_xogly = new Bfr_arg__hatr__xogly();
+	private final    Bfr_arg__elem__capt li_capt = new Bfr_arg__elem__capt();
 	private byte[] ul_cls, xtra_cls, xtra_atr_bry, ul_nl;
 	private final    Xoh_gly_itm_list_wtr itm_list_wtr = new Xoh_gly_itm_list_wtr();
 	public Xoh_gly_grp_wtr() {
-		arg_ary = new Bfr_arg_clearable[] {ul_id};
+		arg_ary = new Bfr_arg_clearable[] {ul_id, ul_xogly, li_capt};
 	}
-	public void Init(boolean mode_is_diff, int id, byte[] cls, int ul_style_max_w, int ul_style_w, byte[] xtra_cls, byte[] xtra_style_bry, byte[] xtra_atr_bry, Xoh_gly_itm_wtr[] ary) {
+	public void Init(boolean mode_is_diff, int id, int xnde_w, int xnde_h, int xnde_per_row, byte[] cls, int ul_style_max_w, int ul_style_w
+		, byte[] xtra_cls, byte[] xtra_style_bry, byte[] xtra_atr_bry, byte[] capt, Xoh_gly_itm_wtr[] ary) {
 		this.Clear();
 		if (!mode_is_diff)
 			ul_id.Set(id); 
+		ul_xogly.Set_args(xnde_w, xnde_h, xnde_per_row);
 		this.ul_cls = cls;
 		this.xtra_cls = xtra_cls == null ? Bry_.Empty : Bry_.Add(Byte_ascii.Space_bry, xtra_cls);
 		this.xtra_atr_bry = xtra_atr_bry;
 		this.ul_nl = ary.length == 0 ? Bry_.Empty : Byte_ascii.Nl_bry;	// TIDY: <ul></ul> should be on same line if 0 items
+		li_capt.Capt_(capt);
 		itm_list_wtr.Init(ary);
 		ul_style.Set_args(ul_style_max_w, ul_style_w, xtra_style_bry);			
 	}
@@ -48,11 +53,11 @@ class Xoh_gly_grp_wtr implements Bfr_arg {
 	public void Bfr_arg__clear() {this.Clear();}
 	public boolean Bfr_arg__missing() {return false;}
 	public void Bfr_arg__add(Bry_bfr bfr) {
-		fmtr.Bld_bfr_many(bfr, ul_id, ul_cls, xtra_cls, ul_style, xtra_atr_bry, itm_list_wtr, ul_nl);
+		fmtr.Bld_bfr_many(bfr, ul_id, ul_xogly, ul_cls, xtra_cls, ul_style, xtra_atr_bry, li_capt, itm_list_wtr, ul_nl);
 	}
 	private static final    Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
-	( "<ul~{id} class=\"gallery mw-gallery-~{cls}~{xtra_cls}\"~{style}~{xtra_atr}>~{itms}~{ul_nl}</ul>"
-	), "id", "cls", "xtra_cls", "style", "xtra_atr", "itms", "ul_nl");
+	( "<ul~{id}~{xogly} class=\"gallery mw-gallery-~{cls}~{xtra_cls}\"~{style}~{xtra_atr}>~{capt}~{itms}~{ul_nl}</ul>"
+	), "id", "xogly", "cls", "xtra_cls", "style", "xtra_atr", "capt", "itms", "ul_nl");
 }
 class Xoh_gly_itm_list_wtr implements Bfr_arg {
 	private Xoh_gly_itm_wtr[] ary; private int ary_len;
@@ -72,40 +77,3 @@ class Xoh_gly_itm_list_wtr implements Bfr_arg {
 		}
 	}
 }
-class Bfr_arg__hatr_gly_style implements Bfr_arg {
-	private final    byte[] atr_bgn;
-	private int max_w, w;
-	private byte[] xtra_cls;
-	public Bfr_arg__hatr_gly_style(byte[] key) {
-		this.atr_bgn = Bfr_arg__hatr_.Bld_atr_bgn(key);
-		this.Clear();
-	}
-	public void Set_args(int max_w, int w, byte[] xtra_cls) {this.max_w = max_w; this.w = w; this.xtra_cls = xtra_cls;}
-	public void Clear() {max_w = 0; w = 0; xtra_cls = null;}
-	public void Bfr_arg__clear() {this.Clear();}
-	public boolean Bfr_arg__missing() {return max_w == 0 && xtra_cls == null;}
-	public void Bfr_arg__add(Bry_bfr bfr) {
-		if (Bfr_arg__missing()) return;
-		bfr.Add(atr_bgn);
-		if (max_w > 0) {
-			bfr.Add(Style__frag_1);
-			bfr.Add_int_variable(max_w);
-			bfr.Add(Style__frag_3);
-		}
-		if (w > 0) {
-			bfr.Add_byte_space();
-			bfr.Add(Style__frag_2);
-			bfr.Add_int_variable(w);
-			bfr.Add(Style__frag_3);
-		}
-		if (xtra_cls != null) {
-			bfr.Add(xtra_cls);
-		}
-		bfr.Add_byte_quote();
-	}
-	private static final    byte[]
-	  Style__frag_1 = Bry_.new_a7("max-width:")
-	, Style__frag_2 = Bry_.new_a7("_width:")
-	, Style__frag_3 = Bry_.new_a7("px;")
-	;
-}
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_html__dump__tst.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_html__dump__tst.java
index 11cbd7a47..945752413 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_html__dump__tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_html__dump__tst.java
@@ -17,9 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.htmls.core.wkrs.glys; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
 import org.junit.*; import gplx.xowa.htmls.core.makes.tests.*;
-public class Xoh_gly_html__dump__tst {
-	private final Xoh_make_fxt fxt = new Xoh_make_fxt();
-	@Before public void init() {fxt.Clear();}
+public class Xoh_gly_html__dump__tst {		
+	@Before public void init() {fxt.Clear();} private final    Xoh_make_fxt fxt = new Xoh_make_fxt();
 	@Test   public void Basic() {
 		fxt.Test__html(String_.Concat_lines_nl_skip_last
 		( "<gallery>"
@@ -27,7 +26,7 @@ public class Xoh_gly_html__dump__tst {
 		, "File:B.png|B1"
 		, "</gallery>"
 		), String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
 		, "  <li class='gallerybox' style='width:155px;'>"
 		, "    <div style='width:155px;'>"
 		, "      <div class='thumb' style='width:150px;'>"
@@ -56,4 +55,52 @@ public class Xoh_gly_html__dump__tst {
 		, "  </li>"
 		, "</ul>"));
 	}
+	@Test   public void Atrs() {
+		fxt.Test__html(String_.Concat_lines_nl_skip_last
+		( "<gallery perrow='5' widths='200' heights='300'>"
+		, "File:A.png|A1"
+		, "</gallery>"
+		), String_.Concat_lines_nl_skip_last
+		( "<ul data-xogly='200|300|5' class='gallery mw-gallery-traditional' style='max-width:1215px; _width:1215px;'>"
+		, "  <li class='gallerybox' style='width:235px;'>"
+		, "    <div style='width:235px;'>"
+		, "      <div class='thumb' style='width:230px;'>"
+		, "        <div style='margin:15px auto;'>"
+		, "          <a href='/wiki/File:A.png' class='image' xowa_title='A.png'><img data-xowa-title=\"A.png\" data-xoimg='0|200|300|-1|-1|-1' src='' width='0' height='0' alt=''/></a>"
+		, "        </div>"
+		, "      </div>"
+		, "      <div class='gallerytext'><p>A1"
+		, "</p>"
+		, ""
+		, "      </div>"
+		, "    </div>"
+		, "  </li>"
+		, "</ul>"));
+	}
+	@Test   public void Packed() {
+		fxt.Test__html(String_.Concat_lines_nl_skip_last
+		( "<gallery mode='packed'>"
+		, "File:A.png|A1"
+		, "</gallery>"
+		), String_.Concat_lines_nl_skip_last
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-packed'>"
+		, "  <li class='gallerybox' style='width:1302px;'>"
+		, "    <div style='width:1302px;'>"
+		, "      <div class='thumb' style='width:1300px;'>"
+		, "        <div style='margin:0px auto;'>"
+		, "          <a href='/wiki/File:A.png' class='image' xowa_title='A.png'><img data-xowa-title=\"A.png\" data-xoimg='0|1950|180|-1|-1|-1' src='' width='0' height='0' alt=''/></a>"
+		, "        </div>"
+		, "      </div>"
+		, "      <div class='gallerytext'><p>A1"
+		, "</p>"
+		, ""
+		, "      </div>"
+		, "    </div>"
+		, "  </li>"
+		, "</ul>"));
+	}
+//					case Gallery_xnde_atrs.Mode_tid:			mode = Gallery_mgr_base_.Get_or_traditional(xatr.Val_as_bry()); break;
+//					case Gallery_xnde_atrs.Perrow_tid:			itms_per_row = xatr.Val_as_int_or(Null); break;
+//					case Gallery_xnde_atrs.Widths_tid:			itm_w = xatr.Val_as_int_or(Null); break;
+//					case Gallery_xnde_atrs.Heights_tid:			itm_h = xatr.Val_as_int_or(Null); break;
 }
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip.java
index 20dff2641..f656a1041 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip.java
@@ -30,19 +30,27 @@ public class Xoh_gly_hzip implements Xoh_hzip_wkr, Gfo_poolable_itm {
 	public Gfo_poolable_itm Encode1(Xoh_hzip_bfr bfr, Xoh_hdoc_wkr hdoc_wkr, Xoh_hdoc_ctx hctx, Xoh_page hpg, boolean wkr_is_root, byte[] src, Object data_obj) {
 		Xoh_gly_grp_data data = (Xoh_gly_grp_data)data_obj;
 		int ul_style_max_w = data.Ul_style_max_w(), ul_style_w = data.Ul_style_w();
-		boolean ul_style_w_diff	= flag_bldr.Set_as_bool(Flag__ul__style_w_diff	, ul_style_max_w != ul_style_w);
-		boolean xtra_atr		= flag_bldr.Set_as_bool(Flag__ul__xtra_atr		, data.Xtra_atr_exists());
-		boolean xtra_cls		= flag_bldr.Set_as_bool(Flag__ul__xtra_cls		, data.Xtra_cls_exists());
-		boolean xtra_style		= flag_bldr.Set_as_bool(Flag__ul__xtra_style	, data.Xtra_style_exists());
+		boolean	xnde_w				= flag_bldr.Set_as_bool(Flag__xnde__w			, data.Xnde_w() != -1);
+		boolean	xnde_h				= flag_bldr.Set_as_bool(Flag__xnde__h			, data.Xnde_h() != -1);
+		boolean	xnde_per_row		= flag_bldr.Set_as_bool(Flag__xnde__per_row		, data.Xnde_per_row() != -1);
+		boolean	capt_exists			= flag_bldr.Set_as_bool(Flag__xnde__caption		, data.Capt_bgn() != -1);
+		boolean ul_style_w_diff		= flag_bldr.Set_as_bool(Flag__ul__style_w_diff	, ul_style_max_w != ul_style_w);
+		boolean xtra_atr			= flag_bldr.Set_as_bool(Flag__ul__xtra_atr		, data.Xtra_atr_exists());
+		boolean xtra_cls			= flag_bldr.Set_as_bool(Flag__ul__xtra_cls		, data.Xtra_cls_exists());
+		boolean xtra_style			= flag_bldr.Set_as_bool(Flag__ul__xtra_style	, data.Xtra_style_exists());
 		flag_bldr.Set(Flag__gly_tid, data.Gly_tid());
 		int itms_len = data.Itms__len();
 		bfr.Add(hook);
 		Gfo_hzip_int_.Encode(1, bfr, flag_bldr.Encode());
 		Gfo_hzip_int_.Encode(1, bfr, ul_style_max_w);
+		if (xnde_w)			Gfo_hzip_int_.Encode(4, bfr, data.Xnde_w());
+		if (xnde_h)			Gfo_hzip_int_.Encode(4, bfr, data.Xnde_h());
+		if (xnde_per_row)	Gfo_hzip_int_.Encode(1, bfr, data.Xnde_per_row());
 		if (ul_style_w_diff) Gfo_hzip_int_.Encode(1, bfr, ul_style_w);
-		if (xtra_cls) bfr.Add_hzip_mid(src, data.Xtra_cls_bgn(), data.Xtra_cls_end());
-		if (xtra_style) bfr.Add_hzip_mid(src, data.Xtra_style_bgn(), data.Xtra_style_end());
-		if (xtra_atr) bfr.Add_hzip_mid(src, data.Xtra_atr_bgn(), data.Xtra_atr_end());
+		if (xtra_cls)		bfr.Add_hzip_mid(src, data.Xtra_cls_bgn(), data.Xtra_cls_end());
+		if (xtra_style)		bfr.Add_hzip_mid(src, data.Xtra_style_bgn(), data.Xtra_style_end());
+		if (xtra_atr)		bfr.Add_hzip_mid(src, data.Xtra_atr_bgn(), data.Xtra_atr_end());
+		if (capt_exists)	bfr.Add_hzip_mid(src, data.Capt_bgn(), data.Capt_end());
 		Gfo_hzip_int_.Encode(1, bfr, itms_len);
 		for (int i = 0; i < itms_len; ++i) {
 			Xoh_gly_itm_data itm_parser = data.Itms__get_at(i);
@@ -59,49 +67,70 @@ public class Xoh_gly_hzip implements Xoh_hzip_wkr, Gfo_poolable_itm {
 	}
 	public void Decode1(Bry_bfr bfr, Xoh_hdoc_wkr hdoc_wkr, Xoh_hdoc_ctx hctx, Xoh_page hpg, Bry_rdr rdr, byte[] src, int src_bgn, int src_end, Xoh_data_itm data_itm) {
 		int flag = rdr.Read_hzip_int(1); flag_bldr.Decode(flag);
-		boolean ul_style_w_diff	= flag_bldr.Get_as_bool(Flag__ul__style_w_diff);
-		boolean xtra_atr		= flag_bldr.Get_as_bool(Flag__ul__xtra_atr);
-		boolean xtra_cls		= flag_bldr.Get_as_bool(Flag__ul__xtra_cls);
-		boolean xtra_style		= flag_bldr.Get_as_bool(Flag__ul__xtra_style);
-		byte    cls_tid			= flag_bldr.Get_as_byte(Flag__gly_tid);
-		byte[] cls_bry = Gallery_mgr_base_.Get_bry_by_tid(cls_tid);
+		boolean xnde_w_exists		= flag_bldr.Get_as_bool(Flag__xnde__w);
+		boolean xnde_h_exists		= flag_bldr.Get_as_bool(Flag__xnde__h);
+		boolean xnde_per_row_exists	= flag_bldr.Get_as_bool(Flag__xnde__per_row);
+		boolean	capt_exists			= flag_bldr.Get_as_bool(Flag__xnde__caption);
+		boolean ul_style_w_diff		= flag_bldr.Get_as_bool(Flag__ul__style_w_diff);
+		boolean xtra_atr			= flag_bldr.Get_as_bool(Flag__ul__xtra_atr);
+		boolean xtra_cls			= flag_bldr.Get_as_bool(Flag__ul__xtra_cls);
+		boolean xtra_style			= flag_bldr.Get_as_bool(Flag__ul__xtra_style);
+		byte    cls_tid				= flag_bldr.Get_as_byte(Flag__gly_tid);
+		byte[] cls_bry = Gallery_mgr_base_.To_bry(cls_tid);
 		int ul_style_max_w = rdr.Read_hzip_int(1); 
+		int xnde_w = xnde_w_exists ? rdr.Read_hzip_int(4) : -1;
+		int xnde_h = xnde_h_exists ? rdr.Read_hzip_int(4) : -1;
+		int xnde_per_row = xnde_per_row_exists ? rdr.Read_hzip_int(1) : -1;
 		int ul_style_w = ul_style_w_diff ? rdr.Read_hzip_int(1) : ul_style_max_w;
 		byte[] xtra_cls_bry = xtra_cls ? rdr.Read_bry_to(): null;
 		byte[] xtra_style_bry = xtra_style ? rdr.Read_bry_to(): null;
 		byte[] xtra_atr_bry = xtra_atr ? rdr.Read_bry_to(): null;
+		byte[] capt = capt_exists ? rdr.Read_bry_to(): null;
 		int li_len = rdr.Read_hzip_int(1);
 		int uid = hctx.Uid__gly__nxt();
 		Xoh_gly_itm_wtr[] itm_ary = new Xoh_gly_itm_wtr[li_len];
+		int li_nth = li_len - 1;
 		for (int i = 0; i < li_len; ++i) {
+			// init wtr for <li>
 			Xoh_gly_itm_wtr itm_wtr = new Xoh_gly_itm_wtr();
 			itm_ary[i] = itm_wtr;
 			int li_w = rdr.Read_hzip_int(1);
 			int div_1_w = rdr.Read_hzip_int(1);
-			int div_2_margin = rdr.Read_hzip_int(1);
+			int div_3_margin = rdr.Read_hzip_int(1);
 			byte capt_tid = (byte)(rdr.Read_byte() - gplx.core.encoders.Base85_.A7_offset);
 			byte[] capt_bry = rdr.Read_bry_to();
 			Xoh_data_itm img_data = hctx.Pool_mgr__data().Get_by_tid(Xoh_hzip_dict_.Tid__img);
 			Xoh_hzip_wkr img_hzip = hctx.Pool_mgr__hzip().Mw__img();
 			img_hzip.Decode1(bfr, hdoc_wkr, hctx, hpg, rdr, src, src_bgn, src_end, img_data);
 			((gplx.xowa.htmls.core.wkrs.imgs.Xoh_img_data)img_data).Img_is_gallery_(true);
-			itm_wtr.Img_wtr().Init_by_decode(hpg, hctx, src, img_data);
-			itm_wtr.Init(hctx.Mode_is_diff(), itm_wtr.Img_wtr().Fsdb_itm().Html_uid(), li_w, div_1_w, div_2_margin, capt_tid, capt_bry);
+
+			// init wtr for <img>
+			itm_wtr.Img_wtr().Init_by_decode(hpg, hctx, src, img_data);				
+			Xof_fsdb_itm fsdb_itm = itm_wtr.Img_wtr().Fsdb_itm();
+			fsdb_itm.Html_elem_tid_(Xof_html_elem.Tid_gallery_v2);
+			fsdb_itm.Html_img_wkr_(itm_wtr);
+			itm_wtr.Init(hctx.Mode_is_diff(), cls_tid, xnde_w, xnde_h, xnde_per_row, fsdb_itm.Html_uid(), i, li_nth, li_w, div_1_w, div_3_margin, capt_tid, capt_bry);
+
+			// release
 			img_data.Pool__rls();
 			img_hzip.Pool__rls();
-		}			
-		grp_wtr.Init(hctx.Mode_is_diff(), uid, cls_bry, ul_style_max_w, ul_style_w, xtra_cls_bry, xtra_style_bry, xtra_atr_bry, itm_ary);
+		}
+		grp_wtr.Init(hctx.Mode_is_diff(), uid, xnde_w, xnde_h, xnde_per_row, cls_bry, ul_style_max_w, ul_style_w, xtra_cls_bry, xtra_style_bry, xtra_atr_bry, capt, itm_ary);
 		grp_wtr.Bfr_arg__add(bfr);
 		hpg.Xtn__gallery_exists_y_();
 	}
 	public void				Pool__rls	() {pool_mgr.Rls_fast(pool_idx);} private Gfo_poolable_mgr pool_mgr; private int pool_idx;
 	public Gfo_poolable_itm	Pool__make	(Gfo_poolable_mgr mgr, int idx, Object[] args) {Xoh_gly_hzip rv = new Xoh_gly_hzip(); rv.pool_mgr = mgr; rv.pool_idx = idx; rv.hook = (byte[])args[0]; return rv;}
-	private final    Int_flag_bldr flag_bldr = new Int_flag_bldr().Pow_ary_bld_(1,	1, 1, 1, 3);
+	private final    Int_flag_bldr flag_bldr = new Int_flag_bldr().Pow_ary_bld_(1,    1, 1, 1, 1,    1, 1, 1, 3);
 	private static final int // SERIALIZED
-	  Flag__ul__style_w_diff	=  0
-	, Flag__ul__xtra_atr		=  1
-	, Flag__ul__xtra_cls		=  2
-	, Flag__ul__xtra_style		=  3
-	, Flag__gly_tid				=  4
+	  Flag__xnde__w				=  0
+	, Flag__xnde__h				=  1
+	, Flag__xnde__per_row		=  2
+	, Flag__xnde__caption		=  3
+	, Flag__ul__style_w_diff	=  4
+	, Flag__ul__xtra_atr		=  5
+	, Flag__ul__xtra_cls		=  6
+	, Flag__ul__xtra_style		=  7
+	, Flag__gly_tid				=  8
 	;
 }
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__basic__tst.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__basic__tst.java
index 82e718102..511ed9b92 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__basic__tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__basic__tst.java
@@ -21,7 +21,7 @@ public class Xoh_gly_hzip__basic__tst {
 	private final    Xoh_hzip_fxt fxt = new Xoh_hzip_fxt().Init_mode_diff_y_();
 	@Test   public void Basic() {
 		fxt.Test__bicode("~'!{,L#{\"g{\"b0!A1~!1A.png~9\"D\"D{\"g{\"b0!B1~!1B.png~9\"D\"Dabc", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px;'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px;'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -46,7 +46,7 @@ public class Xoh_gly_hzip__basic__tst {
 	}
 	@Test   public void Clear_state() {	// page # wasn't being cleared between gallery itms; PAGE:en.w:Almagest; DATE:2016-01-05
 		fxt.Test__bicode("~'!{,L#{\"g{\"b0!A1~!1A.png~{\"d\"D\"D!#{\"g{\"b0!B1~!1B.png~{\"d\"D\"D!$abc", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px;'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px;'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -71,7 +71,23 @@ public class Xoh_gly_hzip__basic__tst {
 	}
 	@Test   public void Extra_cls() {		// PURPOSE: handle extra cls; EX: <gallery class='abc'>
 		fxt.Test__bicode("~'1!cls1 cls2~\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional cls1 cls2'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional cls1 cls2'>"
+		,   "<li class='gallerybox' style='width:155px;'>"
+		,     "<div style='width:155px;'>"
+		,       "<div class='thumb' style='width:150px;'>"
+		,         "<div style='margin:15px auto;'><a href='/wiki/File:A.png' class='image' xowa_title='A.png'><img data-xowa-title='A.png' data-xoimg='0|120|120|-1|-1|-1' src='' width='0' height='0' alt=''></a></div>"
+		,       "</div>"
+		,       "<div class='gallerytext'>"
+		,         "<p>A1</p>"
+		,       "</div>"
+		,     "</div>"
+		,   "</li>"
+		, "</ul>"));
+	}
+	@Test   public void Caption() {	// handle <li class='gallerycaption'>A</li>; PAGE:en.d:a; DATE:2016-06-24
+		fxt.Test__bicode("~'{\"L!Z\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
+		,   "<li class='gallerycaption'>Z</li>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -84,26 +100,9 @@ public class Xoh_gly_hzip__basic__tst {
 		,   "</li>"
 		, "</ul>"));
 	}
-	// FUTURE: galleries with gallerycaption will cause gallery to write raw; instate code below, but would need to then serialize "gallerycaption"; PAGE:en.d:A DATE:2016-06-24
-	//@Test   public void Caption() {	// handle <li class='gallerycaption'>A</li>; PAGE:en.d:a; DATE:2016-06-24
-	//	fxt.Test__bicode("~'!!\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-	//	( "<ul class='gallery mw-gallery-traditional'>"
-	//	,   "<li class='gallerycaption'>A</li>"
-	//	,   "<li class='gallerybox' style='width:155px;'>"
-	//	,     "<div style='width:155px;'>"
-	//	,       "<div class='thumb' style='width:150px;'>"
-	//	,         "<div style='margin:15px auto;'><a href='/wiki/File:A.png' class='image' xowa_title='A.png'><img data-xowa-title='A.png' data-xoimg='0|120|120|-1|-1|-1' src='' width='0' height='0' alt=''></a></div>"
-	//	,       "</div>"
-	//	,       "<div class='gallerytext'>"
-	//	,         "<p>A1</p>"
-	//	,       "</div>"
-	//	,     "</div>"
-	//	,   "</li>"
-	//	, "</ul>"));
-	//}
 	@Test   public void Extra_cls__gallery() {	// handle redundant gallery; EX: <gallery class='gallery'>; PAGE:en.w:Butuan; DATE:2016-01-05
 		fxt.Test__bicode("~'1!gallery~\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional gallery'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional gallery'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -118,7 +117,7 @@ public class Xoh_gly_hzip__basic__tst {
 	}
 	@Test   public void Xtra_atr() {			// PURPOSE: handle extra atr; EX: <gallery id='abc'>
 		fxt.Test__bicode("~'A! id=\"abc\"\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional' id='abc'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional' id='abc'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -136,7 +135,7 @@ public class Xoh_gly_hzip__basic__tst {
 		( "~'!!\"{\"g{\"b0!A1<br>"
 		, "~!1A.png~9\"D\"D"
 		), String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -152,6 +151,31 @@ public class Xoh_gly_hzip__basic__tst {
 	}
 	@Test   public void Tidy__empty() {	// PURPOSE: no items should place </ul> on same line
 		fxt.Test__bicode("~'!!!", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'></ul>"));	// TIDY: <ul></ul> should be on same line if 0 items
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'></ul>"));	// TIDY: <ul></ul> should be on same line if 0 items
+	}
+	@Test   public void Xnde_atrs() {
+		fxt.Test__bicode("~'{6({,L!!#?!!$N&#{\"g{\"b0!A1~!1A.png~9\"D\"D{\"g{\"b0!B1~!1B.png~9\"D\"Dabc", String_.Concat_lines_nl_skip_last
+		( "<ul data-xogly='200|300|5' class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px;'>"
+		,   "<li class='gallerybox' style='width:155px;'>"
+		,     "<div style='width:155px;'>"
+		,       "<div class='thumb' style='width:150px;'>"
+		,         "<div style='margin:15px auto;'><a href='/wiki/File:A.png' class='image' xowa_title='A.png'><img data-xowa-title='A.png' data-xoimg='0|120|120|-1|-1|-1' src='' width='0' height='0' alt=''></a></div>"
+		,       "</div>"
+		,       "<div class='gallerytext'>"
+		,         "<p>A1</p>"
+		,       "</div>"
+		,     "</div>"
+		,   "</li>"
+		,   "<li class='gallerybox' style='width:155px;'>"
+		,     "<div style='width:155px;'>"
+		,       "<div class='thumb' style='width:150px;'>"
+		,         "<div style='margin:15px auto;'><a href='/wiki/File:B.png' class='image' xowa_title='B.png'><img data-xowa-title='B.png' data-xoimg='0|120|120|-1|-1|-1' src='' width='0' height='0' alt=''></a></div>"
+		,       "</div>"
+		,       "<div class='gallerytext'>"
+		,         "<p>B1</p>"
+		,       "</div>"
+		,     "</div>"
+		,   "</li>"
+		, "</ul>abc"));
 	}
 }
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__caption__tst.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__caption__tst.java
index 871b3e271..eb17a9341 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__caption__tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__caption__tst.java
@@ -21,7 +21,7 @@ public class Xoh_gly_hzip__caption__tst {
 	private final    Xoh_hzip_fxt fxt = new Xoh_hzip_fxt().Init_mode_diff_y_();
 	@Test   public void Capt_is_empty() {		// PURPOSE: handle empty caption
 		fxt.Test__bicode("~'!!#{\"g{\"b0#~!1A.png~9\"D\"D{\"g{\"b0#!1A.png9\"D\"D<p>abc</p>", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -44,7 +44,7 @@ public class Xoh_gly_hzip__caption__tst {
 		fxt.Test__bicode(String_.Concat_lines_nl_skip_last
 		( "~'!!\"{\"g{\"b0\"<b><i>A1</i></b>"
 		, "~!1A.png~9\"D\"D"), String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -63,7 +63,7 @@ public class Xoh_gly_hzip__caption__tst {
 		, "b</p>"
 		, "<p><br>"
 		, "~!1A.png~9\"D\"D"), String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
 		, "<li class='gallerybox' style='width:155px;'>"
 		, "<div style='width:155px;'>"
 		, "<div class='thumb' style='width:150px;'>"
@@ -84,7 +84,7 @@ public class Xoh_gly_hzip__caption__tst {
 		( "~'!!\"{\"g{\"b>\"<div class=\"center\"><a href=\"/wiki/B.png\" class=\"image\" xowa_title=\"B.png\"><img data-xowa-title=\"A.png\" data-xoimg=\"0|120|-1|-1|-1|-1\" src=\"\" width=\"0\" height=\"0\" alt=\"\"></a></div>"
 		, "abc~\"\\A.png~#9\"D\"D"
 		), String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
 		, "<li class='gallerybox' style='width:155px;'>"
 		, "<div style='width:155px;'>"
 		, "<div class='thumb' style='width:150px;'>"
@@ -105,7 +105,7 @@ public class Xoh_gly_hzip__caption__tst {
 		, "b"
 		, "~\"\\A.png~#9\"D\"D")
 		, String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
 		, "<li class='gallerybox' style='width:155px;'>"
 		, "<div style='width:155px;'>"
 		, "<div class='thumb' style='width:150px;'>"
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__style__tst.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__style__tst.java
index f370b8670..c9a3a9b87 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__style__tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_hzip__style__tst.java
@@ -21,7 +21,7 @@ public class Xoh_gly_hzip__style__tst {
 	private final    Xoh_hzip_fxt fxt = new Xoh_hzip_fxt().Init_mode_diff_y_();
 	@Test   public void Style__no_max_width() {	// PURPOSE: if no perrow=# then no "style='max-width:###; _width:###;'"
 		fxt.Test__bicode("~'!!\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -36,7 +36,7 @@ public class Xoh_gly_hzip__style__tst {
 	}
 	@Test   public void Style__no_width() {	// PURPOSE: if "_width" omitted, do not add back; EX: style="max-width:648px; margin:auto; background:transparent;"; PAGE:en.w:Wikipedia:Village_pump_(technical)/Archive_86 DATE:2016-01-12
 		fxt.Test__bicode("~'i{,L! color:blue;~\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional' style='max-width:978px; color:blue;'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional' style='max-width:978px; color:blue;'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -51,7 +51,7 @@ public class Xoh_gly_hzip__style__tst {
 	}
 	@Test   public void Style__max_width_duped() {	// PURPOSE: if max-width duped, do not delete 2nd; EX: style="max-width:648px; color:blue; max-width:648px;"; PAGE:en.w:Wikipedia:Village_pump_(technical)/Archive_86 DATE:2016-01-12
 		fxt.Test__bicode("~'){(Z max-width:648px; color:blue;~\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional' style='max-width:652px; _width:652px; max-width:648px; color:blue;'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional' style='max-width:652px; _width:652px; max-width:648px; color:blue;'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -66,7 +66,7 @@ public class Xoh_gly_hzip__style__tst {
 	}
 	@Test   public void Style__append() {		// PURPOSE: handle appended style; EX: <gallery perrow=4 style='color:blue; float:left;'>
 		fxt.Test__bicode("~'){,L color:blue; float:left;~\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px; color:blue; float:left;'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px; color:blue; float:left;'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -81,7 +81,7 @@ public class Xoh_gly_hzip__style__tst {
 	}
 	@Test   public void Style__invalid_unclosed() {	// handle broken styles; EX: <gallery style='center'>
 		fxt.Test__bicode("~'9!center~center~\"{\"g{\"bl!abc~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional center' style='center'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional center' style='center'>"
 		, "<li class='gallerybox' style='width:155px;'>"
 		, "<div style='width:155px;'>"
 		, "<div class='thumb' style='width:150px;'>"
@@ -97,7 +97,7 @@ public class Xoh_gly_hzip__style__tst {
 	}
 	@Test   public void Style__extra_colon() {	// handle broken styles; EX: <gallery style='a:b:c:d;' PAGE:en.w:Bronze_Horseman DATE:2016-01-05
 		fxt.Test__bicode("~'9!center~color:red:float:right;~\"{\"g{\"bl!abc~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional center' style='color:red:float:right;'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional center' style='color:red:float:right;'>"
 		, "<li class='gallerybox' style='width:155px;'>"
 		, "<div style='width:155px;'>"
 		, "<div class='thumb' style='width:150px;'>"
@@ -113,7 +113,7 @@ public class Xoh_gly_hzip__style__tst {
 	}
 	@Test   public void Style__replace() {		// PURPOSE: handle replaced style; EX: <gallery style='color:blue; float:left;'>
 		fxt.Test__bicode("~')!color:blue; float:left;~\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional' style='color:blue; float:left;'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional' style='color:blue; float:left;'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
@@ -128,7 +128,7 @@ public class Xoh_gly_hzip__style__tst {
 	}
 	@Test   public void Style__ws() {		// PURPOSE: handle ws in style; EX: <gallery class="gallery mw-gallery-traditional" style="max-width:1115px; _width:1115px;  color:blue;'>; PAGE:en.w:Anti-Serb_sentiment; DATE:2016-01-08
 		fxt.Test__bicode("~'){,L  color:blue;~\"{\"g{\"b0!A1~!1A.png~9\"D\"D", String_.Concat_lines_nl_skip_last
-		( "<ul class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px;  color:blue;'>"
+		( "<ul data-xogly='-1|-1|-1' class='gallery mw-gallery-traditional' style='max-width:978px; _width:978px;  color:blue;'>"
 		,   "<li class='gallerybox' style='width:155px;'>"
 		,     "<div style='width:155px;'>"
 		,       "<div class='thumb' style='width:150px;'>"
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_itm_wtr.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_itm_wtr.java
index 9012d39e2..a73859595 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_itm_wtr.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_itm_wtr.java
@@ -18,19 +18,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.htmls.core.wkrs.glys; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
 import gplx.core.brys.*; import gplx.core.brys.fmtrs.*;
 import gplx.langs.htmls.*; import gplx.xowa.htmls.core.wkrs.bfr_args.*; import gplx.xowa.htmls.core.wkrs.imgs.*;
-public class Xoh_gly_itm_wtr implements Bfr_arg {
+import gplx.xowa.parsers.lnkis.*; import gplx.xowa.xtns.gallery.*;
+import gplx.xowa.files.*; import gplx.xowa.guis.cbks.js.*;
+public class Xoh_gly_itm_wtr implements Bfr_arg, Js_img_wkr {
 	private final    Bfr_arg_clearable[] arg_ary;
-	private final    Bfr_arg__hatr_id li_id = Bfr_arg__hatr_id.New_id("xogly_li_"), img_id = Bfr_arg__hatr_id.New_id(gplx.xowa.htmls.Xoh_img_mgr.Bry__html_uid)
-	, div_1_id = Bfr_arg__hatr_id.New_id("xowa_gallery_div1_"), div_2_id = Bfr_arg__hatr_id.New_id("xowa_gallery_div2_"), div_3_id = Bfr_arg__hatr_id.New_id("xowa_gallery_div3_");
+	private final    Bfr_arg__hatr_id 
+	  li_id		= Bfr_arg__hatr_id.New_id("xogly_li_")
+	, img_id	= Bfr_arg__hatr_id.New_id(gplx.xowa.htmls.Xoh_img_mgr.Bry__html_uid)
+	, div_1_id	= Bfr_arg__hatr_id.New_id("xowa_gallery_div1_")
+	, div_2_id	= Bfr_arg__hatr_id.New_id("xowa_gallery_div2_")
+	, div_3_id	= Bfr_arg__hatr_id.New_id("xowa_gallery_div3_");
 	private final    Bfr_arg__itm_caption itm_caption_fmtr = new Bfr_arg__itm_caption();
-	private int li_w, div_1_w, div_2_margin;
+	private byte mode;
+	private int xnde_w_orig, xnde_h_orig, xnde_per_row, div_1_w, div_2_w, div_3_margin, li_idx, li_nth;
 	public Xoh_gly_itm_wtr() {
 		arg_ary = new Bfr_arg_clearable[] {li_id, div_1_id, div_2_id, div_3_id, img_id};
 	}
 	public Xoh_img_wtr Img_wtr() {return img_wtr;} private final    Xoh_img_wtr img_wtr = new Xoh_img_wtr();
-	public void Init(boolean mode_is_diff, int img_id, int li_w, int div_1_w, int div_2_margin, byte capt_tid, byte[] itm_caption) {
+	public void Init(boolean mode_is_diff, byte mode, int xnde_w, int xnde_h, int xnde_per_row, int img_id, int li_idx, int li_nth, int div_1_w, int div_2_w, int div_3_margin, byte capt_tid, byte[] itm_caption) {
 		this.Clear();
-		this.li_w = li_w; this.div_1_w = div_1_w; this.div_2_margin = div_2_margin;
+		this.mode = mode; this.xnde_w_orig = xnde_w; this.xnde_h_orig = xnde_h; this.xnde_per_row = xnde_per_row;
+		this.li_idx = li_idx; this.li_nth = li_nth;
+		this.div_1_w = div_1_w; this.div_2_w = div_2_w; this.div_3_margin = div_3_margin;
 		itm_caption_fmtr.Set(capt_tid, itm_caption);
 		if (!mode_is_diff) {
 			li_id.Set(img_id); div_1_id.Set(img_id); div_2_id.Set(img_id); div_3_id.Set(img_id); img_wtr.Img_id_(img_id);
@@ -38,6 +47,9 @@ public class Xoh_gly_itm_wtr implements Bfr_arg {
 		img_wtr.Anch_cls_(Xoh_img_data.Bry__cls__anch__image);
 	}
 	public Xoh_gly_itm_wtr Clear() {
+		this.mode = 0;
+		this.xnde_w_orig = xnde_h_orig = xnde_per_row = li_idx = li_nth = -1;
+		this.div_1_w = div_2_w = div_3_margin = 0;			
 		for (Bfr_arg_clearable arg : arg_ary)
 			arg.Bfr_arg__clear();
 		// img_wtr.Clear(); // TOMBSTONE: do not clear; clear will be called by Xoh_hzip_img.Decode1
@@ -46,20 +58,62 @@ public class Xoh_gly_itm_wtr implements Bfr_arg {
 	public void Bfr_arg__clear() {this.Clear();}
 	public boolean Bfr_arg__missing() {return false;}
 	public void Bfr_arg__add(Bry_bfr bfr) {
-		fmtr.Bld_bfr_many(bfr, li_id, div_1_id, div_2_id, div_3_id, li_w, div_1_w, div_2_margin, img_wtr, itm_caption_fmtr);
+		fmtr.Bld_bfr_many(bfr, li_id, div_1_id, div_2_id, div_3_id, div_1_w, div_2_w, div_3_margin, img_wtr, itm_caption_fmtr);
 	}
+
+	public void Js_wkr__update_hdoc(Xoa_page page, Xog_js_wkr js_wkr, int html_uid, int html_w, int html_h, Io_url html_view_url, int orig_w, int orig_h, Xof_ext orig_ext, Io_url html_orig_url, byte[] lnki_ttl) {
+		Bry_bfr bfr = Bry_bfr_.New();
+
+		// get mgr
+		Gallery_mgr_base mgr = Gallery_mgr_base_.New(mode);
+		int xnde_w_actl = xnde_w_orig == -1 ? Gallery_xnde.Default : xnde_w_orig;
+		int xnde_h_actl = xnde_h_orig == -1 ? Gallery_xnde.Default : xnde_h_orig;
+		mgr.Init(xnde_w_actl, xnde_h_actl, xnde_per_row);
+
+		// get lnki and calculate expanded dimensions; note that packed will generate large widths; EX: 220 -> 2200+
+		gplx.xowa.parsers.lnkis.Xop_lnki_tkn lnki = new gplx.xowa.parsers.lnkis.Xop_lnki_tkn();
+		lnki.Ttl_(page.Wiki().Ttl_parse(lnki_ttl)).W_(html_w).H_(html_h);	// NOTE: gallery_parser also does ad-hoc creation of lnki_tkn
+		mgr.Get_thumb_size(lnki, orig_ext);						// noop if traditional; expand by 1.5 if packed
+		Xof_img_size img_size = new Xof_img_size();
+		img_size.Html_size_calc(Xof_exec_tid.Tid_wiki_page, lnki.W(), lnki.H(), lnki.Lnki_type(), Xof_patch_upright_tid_.Tid_all, lnki.Upright(), orig_ext.Id(), orig_w, orig_h, Xof_img_size.Thumb_width_img);
+		int html_w_expand = img_size.Html_w();
+		int html_h_expand = img_size.Html_h();
+		Xof_fsdb_itm fsdb_itm = img_wtr.Fsdb_itm(); 
+		fsdb_itm.Html_size_(html_w_expand, html_h_expand);
+
+		// update div_1, div_2, div_3 vars
+		div_1_w = mgr.Get_gb_width(html_w_expand, html_h_expand);
+		div_2_w = mgr.Get_thumb_div_width(html_w_expand);
+		div_3_margin = mgr.Get_vpad(xnde_h_actl, html_h_expand);
+
+		// adjust params
+		mgr.Adjust_image_parameters(fsdb_itm);					// noop if traditional; reduce by 1.5 if packed
+		int html_w_normal = fsdb_itm.Html_w();
+		int html_h_normal = fsdb_itm.Html_h();
+		//	fsdb_itm.Init_at_gallery_bgn(html_w_normal, html_h_normal, html_w_expand);		// NOTE: gallery_htmlr updates fsdb_itm, but only need to update img_wtr; NOTE: file_w should be set to expanded width so js can resize if gallery
+		img_wtr.Init_html(html_w_normal, html_h_normal, html_view_url.To_http_file_bry());	// NOTE: html_view_url uses url generated by Xof_file_wkr; theoretically, packed could generate different file, but for now ignore
+
+		// generate html; call json
+		fmtr.Bld_bfr_many(bfr, li_id, div_1_id, div_2_id, div_3_id, div_1_w, div_2_w, div_3_margin, img_wtr, itm_caption_fmtr);
+		js_wkr.Html_elem_replace_html(String_.new_u8(li_id.Get_id_val()), bfr.To_str_and_clear());
+		if (	Gallery_mgr_base_.Mode_is_packed(mode)	// packed gallery
+			&&	li_idx == li_nth) {						// last itm
+			js_wkr.Html_gallery_packed_exec();			// call packed js
+		}
+	}
+
 	public static final    Xoh_gly_itm_wtr[] Ary_empty = new Xoh_gly_itm_wtr[0];
 	private static final    Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
 	( ""
-	, "<li~{li_id} class=\"gallerybox\" style=\"width:~{li_w}px;\">"
-	,   "<div~{div_1_id} style=\"width:~{li_w}px;\">"
-	,     "<div~{div_2_id} class=\"thumb\" style=\"width:~{div_1_w}px;\">"
-	,       "<div~{div_3_id} style=\"margin:~{div_2_margin}px auto;\">~{img_itm}</div>"
+	, "<li~{li_id} class=\"gallerybox\" style=\"width:~{div_1_w}px;\">"
+	,   "<div~{div_1_id} style=\"width:~{div_1_w}px;\">"
+	,     "<div~{div_2_id} class=\"thumb\" style=\"width:~{div_2_w}px;\">"
+	,       "<div~{div_3_id} style=\"margin:~{div_3_margin}px auto;\">~{img_itm}</div>"
 	,     "</div>"
 	,     "<div class=\"gallerytext\">~{itm_caption}</div>"
 	,   "</div>"
 	, "</li>"
-	), "li_id", "div_1_id", "div_2_id", "div_3_id", "li_w", "div_1_w", "div_2_margin", "img_itm", "itm_caption");
+	), "li_id", "div_1_id", "div_2_id", "div_3_id", "div_1_w", "div_2_w", "div_3_margin", "img_itm", "itm_caption");
 }
 class Bfr_arg__itm_caption implements Bfr_arg {
 	private byte capt_tid;
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_itm_wtr_tst.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_itm_wtr_tst.java
index ac819f949..9fed427b0 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_itm_wtr_tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_itm_wtr_tst.java
@@ -16,11 +16,11 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.htmls.core.wkrs.glys; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
-import org.junit.*; import gplx.core.primitives.*; import gplx.xowa.htmls.core.hzips.*;
+import org.junit.*; import gplx.core.primitives.*; import gplx.xowa.htmls.core.hzips.*; import gplx.xowa.xtns.gallery.*;
 public class Xoh_gly_itm_wtr_tst {
 	private final    Xoh_gly_itm_wtr_fxt fxt = new Xoh_gly_itm_wtr_fxt();
 	@Test   public void Basic() {
-		fxt.Init__gly(0, 155, 150, 5, "caption");
+		fxt.Init__gly(Gallery_mgr_base_.Tid__traditional, -1, -1, -1, 0, 155, 150, 5, "caption");
 		fxt.Init__img("/wiki/File:A.png", "A.png", "0|120|120|-1|-1|-1");
 		fxt.Test__write(String_.Concat_lines_nl_skip_last
 		( ""
@@ -40,8 +40,8 @@ public class Xoh_gly_itm_wtr_tst {
 class Xoh_gly_itm_wtr_fxt {
 	private final    Xoh_gly_itm_wtr wtr = new Xoh_gly_itm_wtr();
 	private final    Bry_bfr tmp_bfr = Bry_bfr_.New();
-	public void Init__gly(int id, int itm_w, int file_div_w, int file_div_margin, String caption) {
-		wtr.Init(Bool_.N, id, itm_w, file_div_w, file_div_margin, Xoh_gly_itm_data.Capt_tid__p, Bry_.new_a7(caption));
+	public void Init__gly(byte mode, int xnde_w, int xnde_h, int xnde_per_row, int id, int itm_w, int div_1_w, int div_3_margin, String caption) {
+		wtr.Init(Bool_.N, mode, xnde_w, xnde_h, xnde_per_row, id, 0, 0, itm_w, div_1_w, div_3_margin, Xoh_gly_itm_data.Capt_tid__p, Bry_.new_a7(caption));
 	}
 	public void Init__img(String href, String xowa_title, String xoimg) {
 		wtr.Img_wtr().Init_by_gly(gplx.core.brys.args.Bfr_arg__bry.New(Bry_.new_u8(href)), Bry_.new_u8(xowa_title), gplx.core.brys.args.Bfr_arg__bry.New(Bry_.new_u8(xoimg)));
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_data.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_data.java
index fd01a47bd..ba9e4eaa3 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_data.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_data.java
@@ -39,7 +39,9 @@ public class Xoh_hdr_data implements Xoh_data_itm {
 	public boolean Init_by_parse(Xoh_hdoc_wkr hdoc_wkr, Xoh_hdoc_ctx hctx, Gfh_tag_rdr tag_rdr, byte[] src, Gfh_tag hdr_head, Gfh_tag span_head) {
 		this.Clear();
 		this.src_bgn = hdr_head.Src_bgn(); this.hdr_level = hdr_head.Name_id();
-		Gfh_atr anch_atr = span_head.Atrs__get_by_or_fail(Gfh_atr_.Bry__id);
+		if (hdr_head.Atrs__len() > 0) return false;								// skip manual <h2> with atrs; PAGE:fr.w:Wikipédia:LiveRC/ToDo; DATE:2016-07-02
+		Gfh_atr anch_atr = span_head.Atrs__get_by_or_empty(Gfh_atr_.Bry__id);
+		if (anch_atr.Val_dat_missing()) return false;							// skip manual <h2> without id; PAGE:fr.w:Portail:Nord-Amérindiens/Image_sélectionnée; DATE:2016-07-01
 		this.anch_bgn = anch_atr.Val_bgn(); this.anch_end = anch_atr.Val_end();
 		this.capt_bgn = span_head.Src_end();
 		Gfh_tag hdr_tail = tag_rdr.Tag__move_fwd_tail(hdr_level);				// find </h2> not </span> since <span> can be nested, but <h2> cannot
@@ -59,7 +61,7 @@ public class Xoh_hdr_data implements Xoh_data_itm {
 		this.anch_bgn = anch_bgn; this.anch_end = anch_end; this.capt_bgn = capt_bgn; this.capt_end = capt_end;
 		this.capt_rhs_bgn = capt_rhs_bgn; this.capt_rhs_end = capt_rhs_end;
 	}
-	public static final byte[] Bry__class__mw_headline	= Bry_.new_a7("mw-headline");
+	public static final    byte[] Bry__class__mw_headline	= Bry_.new_a7("mw-headline");
 	public void				Pool__rls	() {pool_mgr.Rls_fast(pool_idx);} private Gfo_poolable_mgr pool_mgr; private int pool_idx;
 	public Gfo_poolable_itm	Pool__make	(Gfo_poolable_mgr mgr, int idx, Object[] args) {Xoh_hdr_data rv = new Xoh_hdr_data(); rv.pool_mgr = mgr; rv.pool_idx = idx; return rv;}
 }
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_hzip_tst.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_hzip_tst.java
index 23506f52d..cbad129b1 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_hzip_tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/hdrs/Xoh_hdr_hzip_tst.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.htmls.core.wkrs.hdrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*;
 import org.junit.*; import gplx.xowa.htmls.core.hzips.*;
 public class Xoh_hdr_hzip_tst {
-	private final Xoh_hzip_fxt fxt = new Xoh_hzip_fxt();
+	private final    Xoh_hzip_fxt fxt = new Xoh_hzip_fxt();
 	@Test   public void Same() {
 		fxt.Test__bicode(String_.Concat_lines_nl_skip_last
 		( "~\"'A~"
@@ -91,4 +91,16 @@ public class Xoh_hdr_hzip_tst {
 		, "</div>"
 		));
 	}
+	@Test   public void Manual__no_id() {// PURPOSE: ignore manual "<h2>" with no id; PAGE:fr.w:Portail:Nord-Am�rindiens/Image_s�lectionn�e; DATE:2016-07-01
+		fxt.Test__bicode
+		( "<h6><span class=\"mw-headline\">A</span></h6>"
+		, "<h6><span class='mw-headline'>A</span></h6>"
+		);
+	}
+	@Test   public void Manual__h_has_atrs() {// PURPOSE: ignore manual "<h2>" with atrs; PAGE:fr.w:Wikip�dia:LiveRC/ToDo; DATE:2016-07-02
+		fxt.Test__bicode
+		( "<h6 style=\"color:red\"><span class=\"mw-headline\" id=\"A\">B</span></h6>"
+		, "<h6 style=\"color:red\"><span class=\"mw-headline\" id=\"A\">B</span></h6>"
+		);
+	}
 }
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/imgs/Xoh_img_wtr.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/imgs/Xoh_img_wtr.java
index 211e29d45..151c08012 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/imgs/Xoh_img_wtr.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/imgs/Xoh_img_wtr.java
@@ -59,6 +59,13 @@ public class Xoh_img_wtr implements Bfr_arg, Xoh_wtr_itm {
 		this.Bfr_arg__add(bfr);
 	}
 	private static final    byte[] Bry__qarg__esc = Bry_.new_a7("%3F");
+	public void Init_html(int html_w, int html_h, byte[] src_bry) {
+		img_w.Set_by_int(html_w);
+		img_h.Set_by_int(html_h);
+		if (gplx.core.envs.Op_sys.Cur().Tid_is_drd())
+			src_bry = Bry_.Replace(src_bry, Byte_ascii.Question_bry, Bry__qarg__esc);	// NOTE: if drd, always escape "?" as "%3F" PAGE:en.w:Cleopatra en.w:Cave_painting; DATE:2016-01-31
+		img_src.Set_by_bry(src_bry);
+	}
 	public boolean Init_by_decode(Xoh_page hpg, Xoh_hdoc_ctx hctx, byte[] src, Xoh_data_itm data_itm) {
 		Xoh_img_data data = (Xoh_img_data)data_itm;
 		this.Clear();
@@ -72,17 +79,13 @@ public class Xoh_img_wtr implements Bfr_arg, Xoh_wtr_itm {
 			fsdb_itm.Init_at_lnki(Xof_exec_tid.Tid_wiki_page, hpg.Wiki().Domain_itm().Abrv_xo(), lnki_ttl, gplx.xowa.parsers.lnkis.Xop_lnki_type.To_flag(img_xowa_image.Lnki_type()), img_xowa_image.Lnki_upright(), img_xowa_image.Lnki_w(), img_xowa_image.Lnki_h(), img_xowa_image.Lnki_time(), img_xowa_image.Lnki_page(), Xof_patch_upright_tid_.Tid_all);
 			hctx.File__mgr().Find(hpg.Wiki(), hpg.Url_bry_safe(), fsdb_itm);
 			this.img_xowa_image.Set_by_arg(img_xowa_image.Clone());	// NOTE: must clone b/c img_xowa_image is member of Xoh_img_data which is poolable (and cleared); PAGE:en.w:Almagest; DATE:2016-01-05
-			img_w.Set_by_int(fsdb_itm.Html_w());
-			img_h.Set_by_int(fsdb_itm.Html_h());
-			byte[] src_bry = fsdb_itm.Html_view_url().To_http_file_bry();
-			if (gplx.core.envs.Op_sys.Cur().Tid_is_drd()) src_bry = Bry_.Replace(src_bry, Byte_ascii.Question_bry, Bry__qarg__esc);	// NOTE: if drd, always escape "?" as "%3F" PAGE:en.w:Cleopatra en.w:Cave_painting; DATE:2016-01-31
-			this.img_src.Set_by_bry(src_bry);
+			this.Init_html(fsdb_itm.Html_w(), fsdb_itm.Html_h(), fsdb_itm.Html_view_url().To_http_file_bry());
 		}
 		else if (data.Img_w() != -1) {
 			img_w.Set_by_int(data.Img_w());
 			img_h.Set_by_int(data.Img_h());
 			this.img_src.Set_by_arg(data.Img_src());
-		}			
+		}
 		if (data.Anch_rel_nofollow_exists()) anch_rel.Set_by_bry(gplx.xowa.htmls.core.wkrs.lnkes.Xoh_lnke_dict_.Html__rel__nofollow);
 		if (!hctx.Mode_is_diff()) {
 			this.Img_id_(fsdb_itm.Html_uid());
diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/lnkis/htmls/Xoh_file_mgr.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/lnkis/htmls/Xoh_file_mgr.java
index 247799ae5..e64633145 100644
--- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/lnkis/htmls/Xoh_file_mgr.java
+++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/lnkis/htmls/Xoh_file_mgr.java
@@ -23,11 +23,11 @@ import gplx.xowa.parsers.*;
 import gplx.xowa.wikis.tdbs.metas.*;
 import gplx.xowa.htmls.core.htmls.*;
 public class Xoh_file_mgr {
-	private final Xowe_wiki wiki;
+	private final    Xowe_wiki wiki;
 	public Xoh_file_mgr(Xowe_wiki wiki, Xow_html_mgr html_mgr, Xoh_html_wtr html_wtr) {
 		this.wiki = wiki; this.file_wtr = new Xoh_file_wtr__basic(wiki, html_mgr, html_wtr);
 	}
-	public Xoh_file_wtr__basic File_wtr() {return file_wtr;} private final Xoh_file_wtr__basic file_wtr;
+	public Xoh_file_wtr__basic File_wtr() {return file_wtr;} private final    Xoh_file_wtr__basic file_wtr;
 	public void Init_by_page(Xoh_wtr_ctx hctx, Xoae_page page) {file_wtr.Init_by_page(hctx, page);}
 	public void Write_or_queue(Bry_bfr bfr, Xoae_page page, Xop_ctx ctx, Xoh_wtr_ctx hctx, byte[] src, Xop_lnki_tkn lnki) {Write_or_queue(bfr, page, ctx, hctx, src, lnki, file_wtr.Arg_alt_text(ctx, src, lnki));}
 	public void Write_or_queue(Bry_bfr bfr, Xoae_page page, Xop_ctx ctx, Xoh_wtr_ctx hctx, byte[] src, Xop_lnki_tkn lnki, byte[] alt_text) {
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_htmlr.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_htmlr.java
new file mode 100644
index 000000000..21427d4dc
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_htmlr.java
@@ -0,0 +1,91 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
+import gplx.langs.htmls.*;
+class Xoh_toc_htmlr implements gplx.core.brys.Bfr_arg {
+	private final    Bry_bfr bfr = Bry_bfr_.New();
+	private final    Bry_bfr numbering_bfr = Bry_bfr_.New();
+	private Ordered_hash itms;
+	private int prv_lvl;
+	public void Clear() {
+		prv_lvl = 0;
+	}
+	public byte[] To_html(Ordered_hash itms, byte[] toc_title, boolean page_banner) {
+		this.itms = itms;
+		fmtr_div.Bld_many(bfr, page_banner ? Bry_.Empty : Bry_toc_cls, toc_title, this);
+		return bfr.To_bry_and_clear();
+	}
+	public byte[] Test__to_html(Ordered_hash itms) {
+		this.itms = itms;
+		Bfr_arg__add(bfr);
+		return bfr.To_bry_and_clear();
+	}
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		int len = itms.Len();
+		prv_lvl = 0;
+		for (int i = 0; i < len; ++i) {
+			Xoh_toc_itm itm = (Xoh_toc_itm)itms.Get_at(i);
+			Write(bfr, itm);
+		}
+
+		// close all open levels
+		for (int i = prv_lvl; i > 0; --i) {
+			int indent = i * 2;
+			bfr.Add_byte_repeat(Byte_ascii.Space, indent + 2).Add(Gfh_tag_.Li_rhs).Add_byte_nl();			// EX: "    </li>\n"
+			bfr.Add_byte_repeat(Byte_ascii.Space, indent    ).Add(Gfh_tag_.Ul_rhs).Add_byte_nl();			// EX: "  </ul>\n"
+		}
+	}
+	private void Write(Bry_bfr bfr, Xoh_toc_itm itm) {
+		int cur_lvl = itm.Lvl();
+		int indent = cur_lvl * 2;
+		switch (CompareAble_.Compare(cur_lvl, prv_lvl)) {
+			case CompareAble_.More:		// start new "<ul>"
+				bfr.Add_byte_repeat(Byte_ascii.Space, indent).Add(Gfh_tag_.Ul_lhs).Add_byte_nl();			// EX: "  <ul>\n"
+				break;
+			case CompareAble_.Same:		// close old "</li>"; NOTE: Comparable_.Same will never be 1st item (so won't ever get </li><li>)
+				bfr.Add_byte_repeat(Byte_ascii.Space, indent + 2).Add(Gfh_tag_.Li_rhs).Add_byte_nl();		// EX: "    </li>\n"
+				break;
+			case CompareAble_.Less:		// close old "</ul>" and "</li>"
+				for (int j = prv_lvl; j > cur_lvl; --j) {
+					bfr.Add_byte_repeat(Byte_ascii.Space, (j * 2) + 2).Add(Gfh_tag_.Li_rhs).Add_byte_nl();	// EX: "    </li>\n"
+					bfr.Add_byte_repeat(Byte_ascii.Space, (j * 2)    ).Add(Gfh_tag_.Ul_rhs).Add_byte_nl();	// EX: "    </ul>\n"
+				}
+				bfr.Add_byte_repeat(Byte_ascii.Space, indent + 2).Add(Gfh_tag_.Li_rhs).Add_byte_nl();		// EX: "    </li>\n"
+				break;
+			default: throw Err_.new_unhandled_default(CompareAble_.Compare(cur_lvl, prv_lvl));
+		}
+
+		// write "<li ..."
+		bfr.Add_byte_repeat(Byte_ascii.Space, indent);	// indent
+		fmtr_itm.Bld_many(bfr, itm.Lvl(), itm.Uid(), itm.Anch(), itm.Path_to_bry(numbering_bfr), itm.Text());
+		prv_lvl = cur_lvl;
+	}
+	private static final    byte[] Bry_toc_cls = Bry_.new_a7(" id=\"toc\" class=\"toc\"");
+	private final    Bry_fmt 
+	  fmtr_div = Bry_fmt.Auto(String_.Concat_lines_nl_skip_last
+	( "<div~{toc}>"
+	, "  <div id=\"toctitle\">"
+	, "    <h2>~{contents_title}</h2>"
+	, "  </div>"
+	, "~{itms}</div>"
+	, ""
+	))
+	, fmtr_itm = Bry_fmt.Auto
+	( "  <li class=\"toclevel-~{level} tocsection-~{toc_idx}\"><a href=\"#~{anchor}\"><span class=\"tocnumber\">~{heading}</span> <span class=\"toctext\">~{text}</span></a>\n"
+	);
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_htmlr__basic__tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_htmlr__basic__tst.java
new file mode 100644
index 000000000..a9a6362b3
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_htmlr__basic__tst.java
@@ -0,0 +1,175 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
+import org.junit.*; import gplx.core.tests.*;
+public class Xoh_toc_htmlr__basic__tst {
+	@Before public void init() {fxt.Clear();} private final    Xoh_toc_htmlr__basic__fxt fxt = new Xoh_toc_htmlr__basic__fxt();
+	@Test   public void D1_S0_S0() {
+		fxt.Init__add(2, "a");
+		fxt.Init__add(2, "b");
+		fxt.Init__add(2, "c");
+		fxt.Test__html_itms
+		( "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#a\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">a</span></a>"
+		, "    </li>"
+		, "    <li class=\"toclevel-1 tocsection-2\"><a href=\"#b\"><span class=\"tocnumber\">2</span> <span class=\"toctext\">b</span></a>"
+		, "    </li>"
+		, "    <li class=\"toclevel-1 tocsection-3\"><a href=\"#c\"><span class=\"tocnumber\">3</span> <span class=\"toctext\">c</span></a>"
+		, "    </li>"
+		, "  </ul>"
+		);
+	}
+	@Test   public void D1_D1_D1() {
+		fxt.Init__add(2, "a");
+		fxt.Init__add(3, "a_a");
+		fxt.Init__add(4, "a_a_a");
+		fxt.Test__html_itms
+		( "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#a\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">a</span></a>"
+		, "    <ul>"
+		, "      <li class=\"toclevel-2 tocsection-2\"><a href=\"#a_a\"><span class=\"tocnumber\">1.1</span> <span class=\"toctext\">a_a</span></a>"
+		, "      <ul>"
+		, "        <li class=\"toclevel-3 tocsection-3\"><a href=\"#a_a_a\"><span class=\"tocnumber\">1.1.1</span> <span class=\"toctext\">a_a_a</span></a>"
+		, "        </li>"
+		, "      </ul>"
+		, "      </li>"
+		, "    </ul>"
+		, "    </li>"
+		, "  </ul>"
+		);
+	}
+	@Test   public void D1_D1_S0_U1() {
+		fxt.Init__add(2, "a");
+		fxt.Init__add(3, "a_a");
+		fxt.Init__add(3, "a_b");
+		fxt.Init__add(2, "b");
+		fxt.Test__html_itms
+		( "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#a\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">a</span></a>"
+		, "    <ul>"
+		, "      <li class=\"toclevel-2 tocsection-2\"><a href=\"#a_a\"><span class=\"tocnumber\">1.1</span> <span class=\"toctext\">a_a</span></a>"
+		, "      </li>"
+		, "      <li class=\"toclevel-2 tocsection-3\"><a href=\"#a_b\"><span class=\"tocnumber\">1.2</span> <span class=\"toctext\">a_b</span></a>"
+		, "      </li>"
+		, "    </ul>"
+		, "    </li>"
+		, "    <li class=\"toclevel-1 tocsection-4\"><a href=\"#b\"><span class=\"tocnumber\">2</span> <span class=\"toctext\">b</span></a>"
+		, "    </li>"
+		, "  </ul>"
+		);
+	}
+	@Test   public void D1_D1_U1_D1() {
+		fxt.Init__add(2, "a");
+		fxt.Init__add(3, "a_a");
+		fxt.Init__add(2, "b");
+		fxt.Init__add(3, "b_a");
+		fxt.Test__html_itms
+		( "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#a\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">a</span></a>"
+		, "    <ul>"
+		, "      <li class=\"toclevel-2 tocsection-2\"><a href=\"#a_a\"><span class=\"tocnumber\">1.1</span> <span class=\"toctext\">a_a</span></a>"
+		, "      </li>"
+		, "    </ul>"
+		, "    </li>"
+		, "    <li class=\"toclevel-1 tocsection-3\"><a href=\"#b\"><span class=\"tocnumber\">2</span> <span class=\"toctext\">b</span></a>"
+		, "    <ul>"
+		, "      <li class=\"toclevel-2 tocsection-4\"><a href=\"#b_a\"><span class=\"tocnumber\">2.1</span> <span class=\"toctext\">b_a</span></a>"
+		, "      </li>"
+		, "    </ul>"
+		, "    </li>"
+		, "  </ul>"
+		);
+	}
+	@Test   public void D1_D1_D1_U2() {
+		fxt.Init__add(2, "a");
+		fxt.Init__add(3, "a_a");
+		fxt.Init__add(4, "a_a_a");
+		fxt.Init__add(2, "b");
+		fxt.Test__html_itms
+		( "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#a\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">a</span></a>"
+		, "    <ul>"
+		, "      <li class=\"toclevel-2 tocsection-2\"><a href=\"#a_a\"><span class=\"tocnumber\">1.1</span> <span class=\"toctext\">a_a</span></a>"
+		, "      <ul>"
+		, "        <li class=\"toclevel-3 tocsection-3\"><a href=\"#a_a_a\"><span class=\"tocnumber\">1.1.1</span> <span class=\"toctext\">a_a_a</span></a>"
+		, "        </li>"
+		, "      </ul>"
+		, "      </li>"
+		, "    </ul>"
+		, "    </li>"
+		, "    <li class=\"toclevel-1 tocsection-4\"><a href=\"#b\"><span class=\"tocnumber\">2</span> <span class=\"toctext\">b</span></a>"
+		, "    </li>"
+		, "  </ul>"
+		);
+	}
+	@Test   public void D1_D2_U1_D1() {
+		fxt.Init__add(2, "a");
+		fxt.Init__add(4, "a_a_a_a");
+		fxt.Init__add(3, "a_a_a");
+		fxt.Init__add(4, "a_a_a_b");
+		fxt.Test__html_itms
+		( "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#a\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">a</span></a>"
+		, "    <ul>"
+		, "      <li class=\"toclevel-2 tocsection-2\"><a href=\"#a_a_a_a\"><span class=\"tocnumber\">1.1</span> <span class=\"toctext\">a_a_a_a</span></a>"
+		, "      </li>"
+		, "      <li class=\"toclevel-2 tocsection-3\"><a href=\"#a_a_a\"><span class=\"tocnumber\">1.2</span> <span class=\"toctext\">a_a_a</span></a>"
+		, "      <ul>"
+		, "        <li class=\"toclevel-3 tocsection-4\"><a href=\"#a_a_a_b\"><span class=\"tocnumber\">1.2.1</span> <span class=\"toctext\">a_a_a_b</span></a>"
+		, "        </li>"
+		, "      </ul>"
+		, "      </li>"
+		, "    </ul>"
+		, "    </li>"
+		, "  </ul>"
+		);
+	}
+	@Test   public void Div() {
+		fxt.Init__init_page("Table of contents", false);
+		fxt.Init__add(2, "a");
+		fxt.Init__add(2, "b");
+		fxt.Init__add(2, "c");
+		fxt.Test__html_div
+		( "<div id=\"toc\" class=\"toc\">"
+		, "  <div id=\"toctitle\">"
+		, "    <h2>Table of contents</h2>"
+		, "  </div>"
+		, "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#a\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">a</span></a>"
+		, "    </li>"
+		, "    <li class=\"toclevel-1 tocsection-2\"><a href=\"#b\"><span class=\"tocnumber\">2</span> <span class=\"toctext\">b</span></a>"
+		, "    </li>"
+		, "    <li class=\"toclevel-1 tocsection-3\"><a href=\"#c\"><span class=\"tocnumber\">3</span> <span class=\"toctext\">c</span></a>"
+		, "    </li>"
+		, "  </ul>"
+		, "</div>"
+		);
+	}
+}
+class Xoh_toc_htmlr__basic__fxt {
+	private final    Xoh_toc_wtr wtr = new Xoh_toc_wtr();
+	public void Clear() {wtr.Clear();}
+	public void Init__add(int hdr_num, String hdr_txt) {wtr.Add(hdr_num, Bry_.new_u8(hdr_txt));}
+	public void Init__init_page(String toc_title, boolean page_banner) {wtr.Init(Bry_.new_u8(toc_title), page_banner);}
+	public void Test__html_itms(String... expd_ary) {
+		Gftest.Eq__ary(expd_ary, String_.Ary(Bry_split_.Split_lines(wtr.Test__to_html())));
+	}
+	public void Test__html_div(String... expd_ary) {
+		Gftest.Eq__ary(expd_ary, String_.Ary(Bry_split_.Split_lines(wtr.To_html())));
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_itm.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_itm.java
new file mode 100644
index 000000000..3e81b2ecf
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_itm.java
@@ -0,0 +1,35 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
+class Xoh_toc_itm {// EX: <li class="toclevel-3 tocsection-3"><a href="#aaa"><span class="tocnumber">1.1.1</span> <span class="toctext">aaa</span></a></li>
+	public int		Uid() {return uid;} private int uid;		// uid of itm; HTML: "tocsection-3"
+	public int		Lvl() {return lvl;} private int lvl;		// indent level; HTML: "toclevel-3"
+	public int[]	Path() {return path;} private int[] path;	// path of itm; HTML: "1.1.1"
+	public byte[]	Anch() {return anch;} private byte[] anch;	// HTML: "#aaa"
+	public byte[]	Text() {return text;} private byte[] text;	// HTML: "aaa"
+	public byte[]	Path_to_bry(Bry_bfr bfr) {
+		int len = path.length;
+		for (int i = 0; i < len; ++i) {
+			if (i != 0) bfr.Add_byte_dot();
+			bfr.Add_int_variable(path[i]);
+		}
+		return bfr.To_bry_and_clear();
+	}
+	public void Set__lvl(int uid, int lvl, int[] path) {this.uid = uid; this.lvl = lvl; this.path = path;}
+	public void Set__txt(byte[] anch, byte[] text) {this.anch = anch; this.text = text;}
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__lvl.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__lvl.java
new file mode 100644
index 000000000..cf2fadc39
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__lvl.java
@@ -0,0 +1,75 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
+class Xoh_toc_wkr__lvl {
+	private static final int Toc_lvls_max = 7;
+	private final    int[] sub_lvl_count = new int[Toc_lvls_max], lvl_count = new int[Toc_lvls_max]; 
+	private int prv_lvl, toc_lvl, prv_toc_lvl;
+	private int uid = 0;
+	public void Clear() {
+		uid = prv_lvl = toc_lvl = prv_toc_lvl = 0;
+	}
+	public void Calc_level(Xoh_toc_itm rv, int lvl) {	// REF.MW:Parser.php!formatHeadings
+		if (lvl > prv_lvl) { // Increase TOC lvl
+			toc_lvl++;
+			sub_lvl_count[toc_lvl - List_adp_.Base1] = 0;
+			if (toc_lvl < Toc_lvls_max) {
+				prv_toc_lvl = toc_lvl;
+				// $toc .= Linker::tocIndent();
+			}
+		}
+		else if (lvl < prv_lvl && toc_lvl > 1) {// Decrease TOC lvl, find lvl to jump to
+			int i = toc_lvl;
+			for (; i > 0; i--) {
+				int cur_lvl_count = lvl_count[i];
+				if (cur_lvl_count == lvl) {	// Found last matching lvl
+					toc_lvl = i;
+					break;
+				}
+				else if (cur_lvl_count < lvl) {	// Found first matching lvl below current lvl
+					toc_lvl = i + 1;
+					break;
+				}
+			}
+			if (i == 0)
+				toc_lvl = 1;
+			if (toc_lvl < Toc_lvls_max) {
+				if (prv_toc_lvl < Toc_lvls_max) {
+					// Unindent only if the previous toc lvl was shown :p
+					// $toc .= Linker::tocUnindent( $prv_toc_lvl - $toc_lvl );
+					prv_toc_lvl = toc_lvl;
+				} else {
+					// $toc .= Linker::tocLineEnd();
+				}
+			}
+		}
+		else {	// No change in lvl, end TOC line
+			if (toc_lvl < Toc_lvls_max) {
+				// $toc .= Linker::tocLineEnd();
+			}
+		}            
+		lvl_count[toc_lvl] = lvl;
+		sub_lvl_count[toc_lvl - List_adp_.Base1] = sub_lvl_count[toc_lvl - List_adp_.Base1] + 1;
+		prv_lvl = lvl;	// NOTE: same as "if ( $toclevel ) $prevlevel = $level;" but at end of block
+
+		// Tfds.Write(lvl, prv_lvl, lvl, toc_lvl, Int_.Ary_concat(",", lvl_count), Int_.Ary_concat(",", sub_lvl_count));
+		int[] copy = new int[toc_lvl];
+		Int_.Ary_copy_to(sub_lvl_count, toc_lvl, copy);
+		rv.Set__lvl(++uid, toc_lvl, copy);
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__lvl__basic__tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__lvl__basic__tst.java
new file mode 100644
index 000000000..2a716b08f
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__lvl__basic__tst.java
@@ -0,0 +1,66 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
+import org.junit.*; import gplx.core.tests.*;
+public class Xoh_toc_wkr__lvl__basic__tst {
+	@Before public void init() {fxt.Clear();} private final    Xoh_toc_wkr__lvl__fxt fxt = new Xoh_toc_wkr__lvl__fxt();
+	@Test   public void D1_S0_S0() {
+		fxt.Test__calc(2, fxt.Make(1, 1, Int_.Ary(1)));
+		fxt.Test__calc(2, fxt.Make(2, 1, Int_.Ary(2)));
+		fxt.Test__calc(2, fxt.Make(3, 1, Int_.Ary(3)));
+	}
+	@Test   public void D1_D1_D1() {
+		fxt.Test__calc(2, fxt.Make(1, 1, Int_.Ary(1)));
+		fxt.Test__calc(3, fxt.Make(2, 2, Int_.Ary(1, 1)));
+		fxt.Test__calc(4, fxt.Make(3, 3, Int_.Ary(1, 1, 1)));
+	}
+	@Test   public void D1_D1_S0_U1() {
+		fxt.Test__calc(2, fxt.Make(1, 1, Int_.Ary(1)));
+		fxt.Test__calc(3, fxt.Make(2, 2, Int_.Ary(1, 1)));
+		fxt.Test__calc(3, fxt.Make(3, 2, Int_.Ary(1, 2)));
+		fxt.Test__calc(2, fxt.Make(4, 1, Int_.Ary(2)));
+	}
+	@Test   public void D1_D1_U1_D1() {
+		fxt.Test__calc(2, fxt.Make(1, 1, Int_.Ary(1)));
+		fxt.Test__calc(3, fxt.Make(2, 2, Int_.Ary(1, 1)));
+		fxt.Test__calc(2, fxt.Make(3, 1, Int_.Ary(2)));
+		fxt.Test__calc(3, fxt.Make(4, 2, Int_.Ary(2, 1)));
+	}
+	@Test   public void D1_D1_D1_U2() {
+		fxt.Test__calc(2, fxt.Make(1, 1, Int_.Ary(1)));
+		fxt.Test__calc(3, fxt.Make(2, 2, Int_.Ary(1, 1)));
+		fxt.Test__calc(4, fxt.Make(3, 3, Int_.Ary(1, 1, 1)));
+		fxt.Test__calc(2, fxt.Make(4, 1, Int_.Ary(2)));
+	}
+}
+class Xoh_toc_wkr__lvl__fxt {
+	private final    Xoh_toc_wkr__lvl wkr = new Xoh_toc_wkr__lvl();
+	private final    Xoh_toc_itm actl = new Xoh_toc_itm();
+	public void Clear() {wkr.Clear();}
+	public Xoh_toc_itm Make(int uid, int lvl, int[] path) {
+		Xoh_toc_itm rv = new Xoh_toc_itm();
+		rv.Set__lvl(uid, lvl, path);
+		return rv;
+	}
+	public void Test__calc(int lvl, Xoh_toc_itm expd) {
+		wkr.Calc_level(actl, lvl);
+		Gftest.Eq__int(expd.Uid(), actl.Uid(), "uid");
+		Gftest.Eq__int(expd.Lvl(), actl.Lvl(), "lvl");
+		Gftest.Eq__ary(expd.Path(), actl.Path(), "path");
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt.java
new file mode 100644
index 000000000..d64eb687e
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt.java
@@ -0,0 +1,152 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
+import gplx.langs.htmls.*; import gplx.langs.htmls.docs.*; import gplx.langs.htmls.encoders.*;
+import gplx.xowa.parsers.amps.*; import gplx.core.primitives.*;
+class Xoh_toc_wkr__txt {
+	private final    Gfh_tag_rdr tag_rdr = Gfh_tag_rdr.New__html();
+	private final    Bry_bfr anch_bfr = Bry_bfr_.New(), text_bfr = Bry_bfr_.New();
+	private final    Gfo_url_encoder anch_encoder = Gfo_url_encoder_.New__id();
+	private final    Xop_amp_mgr amp_mgr = Xop_amp_mgr.Instance;
+	private final    Hash_adp anch_hash = Hash_adp_bry.ci_u8(gplx.xowa.langs.cases.Xol_case_mgr_.U8());
+	private byte[] page_name = Bry_.Empty;
+	public void Clear() {
+		anch_bfr.Clear();
+		text_bfr.Clear();
+		anch_hash.Clear();
+	}
+	public void Calc_anch_text(Xoh_toc_itm rv, byte[] src) {	// text within hdr; EX: <h2>Abc</h2> -> Abc
+		int end = src.length;
+		src = Remove_comment(text_bfr, src, 0, end);
+		end = src.length;
+		tag_rdr.Init(page_name, src, 0, end);
+		Calc_anch_text_recurse(src, 0, end);
+
+		byte[] anch_bry = anch_bfr.To_bry_and_clear_and_trim(Bool_.Y, Bool_.Y, id_trim_ary);
+		Int_obj_ref anch_idx_ref = (Int_obj_ref)anch_hash.Get_by(anch_bry);
+		if (anch_idx_ref == null) {
+			anch_hash.Add(anch_bry, Int_obj_ref.New(2));
+		}
+		else {
+			int anch_idx = anch_idx_ref.Val();
+			anch_bry = Bry_.Add(anch_bry, Byte_ascii.Underline_bry, Int_.To_bry(anch_idx));
+			anch_idx_ref.Val_(anch_idx + 1);
+		}
+		rv.Set__txt
+		( anch_bry
+		, text_bfr.To_bry_and_clear_and_trim());	// NOTE: both id and text trim ends
+	}
+	private void Calc_anch_text_recurse(byte[] src, int pos, int end) {
+		tag_rdr.Src_rng_(pos, end);
+		while (pos < end) {
+			Gfh_tag lhs = tag_rdr.Tag__move_fwd_head();
+			int tag_id = lhs.Name_id();
+			byte[] span_dir = null;
+
+			// add any text before lhs;
+			int txt_end = lhs.Src_bgn();
+			switch (tag_id) {
+				case Gfh_tag_.Id__eos:		txt_end = end; break;			// eos; print everything until end
+			}
+			
+			// add any text before tag
+			if (pos < txt_end) {
+				byte[] anch_bry = amp_mgr.Decode_as_bry(Bry_.Mid(src, pos, txt_end));
+				anch_encoder.Encode(anch_bfr, anch_bry);
+				text_bfr.Add_mid(src, pos, txt_end);
+			}
+
+			// set print_tag tag; REF.MW:Parser.php!formatHeadings
+			boolean print_tag = false;
+			switch (tag_id) {
+				case Gfh_tag_.Id__eos:		// eos; return;
+					return;
+				case Gfh_tag_.Id__sup:		// always print tag; REF.MW:Parser.php!formatHeadings!"Allowed tags are"
+				case Gfh_tag_.Id__sub:
+				case Gfh_tag_.Id__i:
+				case Gfh_tag_.Id__b:
+				case Gfh_tag_.Id__bdi:
+					print_tag = true;
+					break;
+				case Gfh_tag_.Id__span:		// print span only if it has a dir attribute
+					span_dir = lhs.Atrs__get_as_bry(Gfh_atr_.Bry__dir);
+					print_tag = Bry_.Len_gt_0(span_dir);
+					break;
+				case Gfh_tag_.Id__comment:	// never print tag
+				case Gfh_tag_.Id__any:		// all other tags never print
+				default:
+					print_tag = false;
+					break;
+			}
+
+			// get lhs / rhs vars
+			byte[] lhs_bry = lhs.Name_bry();
+			int lhs_end = lhs.Src_end();
+			boolean lhs_is_pair = !lhs.Tag_is_inline();
+			int rhs_bgn = -1, rhs_end = -1, new_pos = lhs_end;
+			if (lhs_is_pair) {	// get rhs unless inline
+				Gfh_tag rhs = tag_rdr.Tag__move_fwd_tail(tag_id);
+				rhs_bgn = rhs.Src_bgn(); rhs_end = rhs.Src_end();
+				new_pos = rhs_end;
+			}
+
+			// print "<tag></tag>"; also, recurse
+			if (print_tag) {
+				text_bfr.Add_byte(Byte_ascii.Angle_bgn).Add(lhs_bry);
+				if (span_dir != null)	// if span has dir, add it; EX: <span id='1' dir='rtl'> -> <span dir='rtl'>
+					Gfh_atr_.Add(text_bfr, Gfh_atr_.Bry__dir, span_dir);					
+				text_bfr.Add_byte(Byte_ascii.Angle_end);	// only add name; do not add atrs; EX: <i id='1'> -> <i>
+			}
+			Calc_anch_text_recurse(src, lhs_end, rhs_bgn);
+			if (print_tag && lhs_is_pair)
+				text_bfr.Add_mid(src, rhs_bgn, rhs_end);
+
+			// set new_pos
+			pos = new_pos;
+			tag_rdr.Src_rng_(new_pos, end);	// NOTE: must reinit pos and especially end
+		}
+	}
+
+	public static byte[] Remove_comment(Bry_bfr tmp, byte[] src, int bgn, int end) {
+		boolean dirty = false, append_to_eos = true;
+		int pos = bgn;
+		while (true) {
+			int comm_bgn = Bry_find_.Find_fwd(src, Gfh_tag_.Comm_bgn, pos, end);
+			if (comm_bgn != -1) {	// comment found
+				int tmp_pos = comm_bgn + Gfh_tag_.Comm_bgn_len;
+				int comm_end = Bry_find_.Find_fwd(src, Gfh_tag_.Comm_end, tmp_pos, end);
+				if (comm_end == -1) {	// dangling
+					tmp.Add_mid(src, pos, comm_bgn);
+					append_to_eos = false;
+				}
+				else {
+					dirty = true;
+					tmp.Add_mid(src, pos, comm_bgn);
+					pos = comm_end + Gfh_tag_.Comm_end_len;
+					continue;
+				}
+			}
+			break;
+		}
+		if (dirty && append_to_eos) {
+			tmp.Add_mid(src, pos, end);
+		}
+		return dirty ? tmp.To_bry_and_clear() : src;
+	}
+	private static final    byte[] id_trim_ary = Bry_.mask_(256, Byte_ascii.Underline_bry);
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt__basic__tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt__basic__tst.java
new file mode 100644
index 000000000..f4ae2f51b
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt__basic__tst.java
@@ -0,0 +1,69 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
+import org.junit.*; import gplx.core.tests.*;
+public class Xoh_toc_wkr__txt__basic__tst {
+	@Before public void init() {fxt.Clear();} private final    Xoh_toc_wkr__txt__fxt fxt = new Xoh_toc_wkr__txt__fxt();
+	@Test   public void Basic() {
+		fxt.Test__both("a b c", "a_b_c", "a b c");
+	}
+	@Test   public void Ws() {
+		fxt.Test__both(" a b ", "a_b", "a b");
+	}
+	@Test   public void Amp__ncr() {
+		fxt.Test__both("&#91;a&#93;", ".5Ba.5D", "&#91;a&#93;");
+	}
+	@Test   public void Encode() {
+		fxt.Test__both("a+b", "a.2Bb", "a+b");
+	}
+	@Test   public void Dupe() {
+		fxt.Test__both("a", "a", "a");
+		fxt.Test__both("a", "a_2", "a");
+		fxt.Test__both("A", "A_3", "A");
+	}
+	@Test   public void Comment() {
+		fxt.Test__text("a<!--b-->c", "ac");
+	}
+	@Test   public void Remove_comment__one() {
+		fxt.Test__remove_comment("a<!--b-->c", "ac");
+	}
+	@Test   public void Remove_comment__many() {
+		fxt.Test__remove_comment("1<!--2-->3<!--4-->5", "135");
+	}
+	@Test   public void Remove_comment__dangling() {
+		fxt.Test__remove_comment("1<!--2-->3<!--4->5", "13");
+	}
+}
+class Xoh_toc_wkr__txt__fxt {
+	private final    Xoh_toc_wkr__txt wkr = new Xoh_toc_wkr__txt();
+	private final    Xoh_toc_itm itm = new Xoh_toc_itm();
+	private final    Bry_bfr tmp = Bry_bfr_.New();
+	public void Clear() {wkr.Clear();}
+	public void Test__id  (String html, String expd_id)		{Test__both(html, expd_id, null);}
+	public void Test__text(String html, String expd_text)	{Test__both(html, null, expd_text);}
+	public void Test__both(String html, String expd)		{Test__both(html, expd, expd);}
+	public void Test__both(String html, String expd_anch, String expd_text) {
+		wkr.Calc_anch_text(itm, Bry_.new_u8(html));
+		if (expd_anch != null)	Gftest.Eq__str(expd_anch, itm.Anch(), "anch");
+		if (expd_text != null)	Gftest.Eq__str(expd_text, itm.Text(), "text");
+	}
+	public void Test__remove_comment(String html, String expd) {
+		byte[] html_bry = Bry_.new_u8(html);
+		Gftest.Eq__str(expd, Xoh_toc_wkr__txt.Remove_comment(tmp, html_bry, 0, html_bry.length));
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt__xnde__tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt__xnde__tst.java
new file mode 100644
index 000000000..5f5b5a760
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wkr__txt__xnde__tst.java
@@ -0,0 +1,39 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
+import org.junit.*; import gplx.core.tests.*;
+public class Xoh_toc_wkr__txt__xnde__tst {
+	@Before public void init() {fxt.Clear();} private final    Xoh_toc_wkr__txt__fxt fxt = new Xoh_toc_wkr__txt__fxt();
+	@Test   public void I()				{fxt.Test__both("<i>a</i>"								, "a", "<i>a</i>");}
+	@Test   public void I__id()			{fxt.Test__both("<i id='1'>a</i>"						, "a", "<i>a</i>");}
+	@Test   public void B()				{fxt.Test__both("<b>a</b>"								, "a", "<b>a</b>");}
+	@Test   public void Sup()			{fxt.Test__both("<sup>a</sup>"							, "a", "<sup>a</sup>");}
+	@Test   public void Sub()			{fxt.Test__both("<sub>a</sub>"							, "a", "<sub>a</sub>");}
+	@Test   public void Bdi()			{fxt.Test__both("<bdi>a</bdi>"							, "a", "<bdi>a</bdi>");}
+	@Test   public void Span()			{fxt.Test__both("<span>a</span>"						, "a", "a");}
+	@Test   public void Span__id()		{fxt.Test__both("<span id='1'>a</span>"					, "a", "a");}
+	@Test   public void Span__dir()		{fxt.Test__both("<span dir=\"ltr\">a</span>"			, "a", "<span dir=\"ltr\">a</span>");}
+	@Test   public void Span__dir_id()	{fxt.Test__both("<span id='1' dir=\"ltr\">a</span>"		, "a", "<span dir=\"ltr\">a</span>");}
+	@Test   public void Small()			{fxt.Test__text("<small>a</small>"						, "a");}
+	@Test   public void A()				{fxt.Test__both("<a href=\"/wiki/A\">b</a>"				, "b");}
+	@Test   public void A__nest()		{fxt.Test__both("<a href=\"/wiki/A\">b<i>c</i>d</a>"	, "bcd", "b<i>c</i>d");}
+	@Test   public void Br()			{fxt.Test__both("a<br/>b"								, "ab");}
+	@Test   public void H2()			{fxt.Test__both("a<h2>b</h2>c"							, "abc");}	// NOTE: not a valid test; MW actually generates "ab" b/c of tidy; see corresponding edit test; DATE:2016-06-28
+	@Test   public void Li()			{fxt.Test__text("a<ul><li>b</li></ul>c"					, "abc");}
+	@Test   public void Table()			{fxt.Test__text("a<table><tr><td>b</td></tr></table>c"	, "abc");}
+}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr.java
index 9daf17f74..827dfc3b9 100644
--- a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr.java
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr.java
@@ -16,108 +16,32 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
-import gplx.langs.htmls.*; import gplx.langs.htmls.docs.*;
 class Xoh_toc_wtr {
-	private final    Gfh_tag_rdr tag_rdr = Gfh_tag_rdr.New__html();
-	private byte[] page_name = Bry_.Empty;
-	private final    Bry_bfr bfr = Bry_bfr_.New();
+	private final    Ordered_hash itms = Ordered_hash_.New_bry();
+	private final    Xoh_toc_wkr__lvl lvl_wkr = new Xoh_toc_wkr__lvl();
+	private final    Xoh_toc_wkr__txt txt_wkr = new Xoh_toc_wkr__txt();
+	private final    Xoh_toc_htmlr htmlr = new Xoh_toc_htmlr();
+	private byte[] toc_title; private boolean page_banner;
 	public void Clear() {
-		bfr.Clear();
+		itms.Clear();
+		lvl_wkr.Clear();
+		txt_wkr.Clear();
+		htmlr.Clear();
 	}
-	public void Page_name_(byte[] page_name) {this.page_name = page_name;}
-	public byte[] Convert(byte[] src) {	// text within hdr; EX: <h2>Abc</h2> -> Abc
-		int end = src.length;
-		tag_rdr.Init(page_name, src, 0, end);
-		Convert_recurse(0, src, 0, end);
-		return bfr.To_bry_and_clear_and_trim();
+	public void Init(byte[] toc_title, boolean page_banner) {
+		this.toc_title = toc_title;
+		this.page_banner = page_banner;
 	}
-	private static void Add_wo_comment(Bry_bfr bfr, byte[] src, int bgn, int end) {
-		int pos = bgn;
-		while (true) {
-			int comm_bgn = Bry_find_.Find_fwd(src, Gfh_tag_.Comm_bgn, pos, end);
-			if (comm_bgn != -1) {
-				int tmp_pos = comm_bgn + Gfh_tag_.Comm_bgn_len;
-				int comm_end = Bry_find_.Find_fwd(src, Gfh_tag_.Comm_end, tmp_pos, end);
-				if (comm_end != -1) {
-					bfr.Add_mid(src, pos, comm_bgn);
-					pos = comm_end + Gfh_tag_.Comm_end_len;
-					continue;
-				}
-			}
-			bfr.Add_mid(src, pos, end);
-			break;
-		}
+	public void Add(int hdr_num, byte[] hdr_txt) {
+		Xoh_toc_itm itm = new Xoh_toc_itm();
+		lvl_wkr.Calc_level(itm, hdr_num);
+		txt_wkr.Calc_anch_text(itm, hdr_txt);
+		itms.Add(itm.Anch(), itm);
 	}
-	private void Convert_recurse(int depth, byte[] src, int pos, int end) {
-		tag_rdr.Src_rng_(pos, end);
-		while (pos < end) {
-			Gfh_tag lhs = tag_rdr.Tag__move_fwd_head();
-			int tag_id = lhs.Name_id();
-
-			// add any text before lhs;
-			int txt_end = lhs.Src_bgn();
-			switch (tag_id) {
-				case Gfh_tag_.Id__eos:		txt_end = end; break;			// eos; print everything until end
-			}
-
-			if (pos < txt_end) Add_wo_comment(bfr, src, pos, txt_end);	
-
-			// set print_tag / recurse based on tag
-			boolean print_tag = false, recurse = true;
-			switch (tag_id) {
-				case Gfh_tag_.Id__eos:		// eos; return;
-					return;
-				case Gfh_tag_.Id__comment:	// never print tag
-				case Gfh_tag_.Id__img:		
-				case Gfh_tag_.Id__br: case Gfh_tag_.Id__hr:	// always ignore in TOC text; EX: en.wikipedia.org/wiki/Magnetic_resonance_imaging; ====''T''<span style="display:inline-block; margin-bottom:-0.3em; vertical-align:-0.4em; line-height:1.2em;  font-size:85%; text-align:left;">*<br />2</span>-weighted MRI====
-				case Gfh_tag_.Id__h1: case Gfh_tag_.Id__h2: case Gfh_tag_.Id__h3: case Gfh_tag_.Id__h4: case Gfh_tag_.Id__h5: case Gfh_tag_.Id__h6:
-				case Gfh_tag_.Id__ul: case Gfh_tag_.Id__ol: case Gfh_tag_.Id__dd: case Gfh_tag_.Id__dt: case Gfh_tag_.Id__li:
-				case Gfh_tag_.Id__table: case Gfh_tag_.Id__tr: case Gfh_tag_.Id__td: case Gfh_tag_.Id__th: case Gfh_tag_.Id__thead: case Gfh_tag_.Id__tbody: case Gfh_tag_.Id__caption:
-				// case Gfh_tag_.Id__ref:	// NOTE: don't bother printing references; NOTE: should never show up
-					print_tag = false;
-					recurse = false;
-					break;
-				case Gfh_tag_.Id__b:		// always print tag
-				case Gfh_tag_.Id__i:	
-					print_tag = true;
-					break;
-				case Gfh_tag_.Id__small:	// only print tag if not nested
-				case Gfh_tag_.Id__sup:
-				case Gfh_tag_.Id__any:
-				default: {
-					if (depth > 0)
-						print_tag = true;
-					break;
-				}
-				case Gfh_tag_.Id__a:		// a never prints tag; also, also, do not recurse if ref
-					print_tag = false;						
-					byte[] href_val = lhs.Atrs__get_as_bry(Gfh_atr_.Bry__href);
-					if (Bry_.Has_at_bgn(href_val, gplx.xowa.xtns.cites.Ref_html_wtr_cfg.Note_href_bgn))	// do not print if href='#cite_note-...'; EX: <a href=\"#cite_note-0\">[1]</a>
-						recurse = false;
-					break;
-			}
-
-			// get lhs / rhs vars
-			int lhs_bgn = lhs.Src_bgn(), lhs_end = lhs.Src_end();
-			boolean lhs_is_pair = !lhs.Tag_is_inline();
-			int rhs_bgn = -1, rhs_end = -1, new_pos = lhs_end;
-			if (lhs_is_pair) {	// get rhs unless inline
-				Gfh_tag rhs = tag_rdr.Tag__move_fwd_tail(tag_id);
-				rhs_bgn = rhs.Src_bgn(); rhs_end = rhs.Src_end();
-				new_pos = rhs_end;
-			}
-
-			// print "<tag></tag>"; also, recurse
-			if (print_tag) bfr.Add_mid(src, lhs_bgn, lhs_end);
-			if (recurse) {
-				Convert_recurse(depth + 1, src, lhs_end, rhs_bgn);
-			}
-			if (print_tag && lhs_is_pair)
-				bfr.Add_mid(src, rhs_bgn, rhs_end);
-
-			// set new_pos
-			pos = new_pos;
-			tag_rdr.Src_rng_(new_pos, end);	// NOTE: must reinit pos and especially end
-		}
+	public byte[] To_html() {
+		return htmlr.To_html(itms, toc_title, page_banner);
+	}
+	public byte[] Test__to_html() {
+		return htmlr.Test__to_html(itms);
 	}
 }
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__anch__tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__anch__tst.java
deleted file mode 100644
index e5ce004e4..000000000
--- a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__anch__tst.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
-import org.junit.*; import gplx.core.tests.*;
-public class Xoh_toc_wtr__anch__tst {
-	@Before public void init() {fxt.Clear();} private final    Xoh_toc_wtr_fxt fxt = new Xoh_toc_wtr_fxt();
-	@Test   public void Caption() {
-		fxt.Test__convert("<a href=\"/wiki/A\">b</a>", "b");
-	}
-	@Test   public void Ref() {	// PURPOSE: ref contents should not print in TOC; DATE:2013-07-23
-		fxt.Test__convert("a<sup id=\"cite_ref-0\" class=\"reference\"><a href=\"#cite_note-0\">[1]</a></sup>", "a");
-	}
-	@Test   public void Category() { // PURPOSE: literal Category should show in in TOC; EX: de.w:1234; DATE:2014-01-21
-		fxt.Test__convert("A<a href=\"/wiki/Category:B\">Category:B</a>", "ACategory:B");
-	}
-	@Test   public void File() { // PURPOSE: file should not show in in TOC; EX: tr.w:D�nya_Miraslari; DATE:2014-06-06
-		fxt.Test__convert
-		( "<a href=\"/wiki/File:A.png\" class=\"image\" xowa_title=\"A.png\"><img id=\"xoimg_0\" alt=\"\" src=\"file:///mem/wiki/repo/trg/orig/7/0/A.png\" width=\"0\" height=\"0\" /></a> b"
-		, "b");
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__keep__tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__keep__tst.java
deleted file mode 100644
index 949d82030..000000000
--- a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__keep__tst.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
-import org.junit.*; import gplx.core.tests.*;
-public class Xoh_toc_wtr__keep__tst {		
-	@Before public void init() {fxt.Clear();} private final    Xoh_toc_wtr_fxt fxt = new Xoh_toc_wtr_fxt();
-	@Test   public void Basic() {
-		fxt.Test__convert("a b c", "a b c");
-	}
-	@Test   public void Ws() {
-		fxt.Test__convert(" a b ", "a b");
-	}
-	@Test   public void Amp__ncr() {
-		fxt.Test__convert("&#91;a&#93;", "&#91;a&#93;");
-	}
-	@Test   public void Italic() {
-		fxt.Test__convert("<i>a</i>", "<i>a</i>");
-	}
-	@Test   public void Caption() {
-		fxt.Test__convert("<a href=\"/wiki/A\">b</a>", "b");
-	}
-	@Test   public void Ref() {	// PURPOSE: ref contents should not print in TOC; DATE:2013-07-23
-		fxt.Test__convert("a<sup id=\"cite_ref-0\" class=\"reference\"><a href=\"#cite_note-0\">[1]</a></sup>", "a");
-	}
-	@Test   public void Category__literal() { // PURPOSE: literal Category should show in in TOC; EX: de.w:1234; DATE:2014-01-21
-		fxt.Test__convert("A<a href=\"/wiki/Category:B\">Category:B</a>", "ACategory:B");
-	}
-	@Test   public void File() { // PURPOSE: file should show in in TOC; EX: tr.w:D�nya_Miraslari; DATE:2014-06-06
-		fxt.Test__convert
-		( "<a href=\"/wiki/File:A.png\" class=\"image\" xowa_title=\"A.png\"><img id=\"xoimg_0\" alt=\"\" src=\"file:///mem/wiki/repo/trg/orig/7/0/A.png\" width=\"0\" height=\"0\" /></a> b"
-		, "b");
-	}
-}
-class Xoh_toc_wtr_fxt {
-	private final    Xoh_toc_wtr wtr = new Xoh_toc_wtr();
-	public void Clear() {wtr.Clear();}
-	public void Test__convert(String html, String expd) {
-		Gftest.Eq__str(expd, wtr.Convert(Bry_.new_u8(html)));
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__nest__tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__nest__tst.java
deleted file mode 100644
index cd95fdb52..000000000
--- a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__nest__tst.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
-import org.junit.*; import gplx.core.tests.*;
-public class Xoh_toc_wtr__nest__tst {
-	@Before public void init() {fxt.Clear();} private final    Xoh_toc_wtr_fxt fxt = new Xoh_toc_wtr_fxt();
-	@Test   public void Xnde__xnde() {	// <sup> removed but not <small>
-		fxt.Test__convert("a <sup>b<small>c</small>d</sup> e", "a b<small>c</small>d e");
-	}
-	@Test   public void Xnde__inline() {	// PURPOSE: do not render inline xndes; EX: Magnetic_resonance_imaging
-		fxt.Test__convert("a<span id='b'>b<br/></span>", "ab");
-	}
-	@Test   public void Xnde__lnki() {	// <small> and <a> removed
-		fxt.Test__convert("<small><a href=\"/wiki/A\">b</a></small>", "b");
-	}
-	@Test   public void Lnki__xnde() {
-		fxt.Test__convert("<a href=\"/wiki/A\">b<i>c</i>d</a>", "b<i>c</i>d");
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__skip__tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__skip__tst.java
deleted file mode 100644
index feaa542ad..000000000
--- a/400_xowa/src/gplx/xowa/htmls/tocs/Xoh_toc_wtr__skip__tst.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
-import org.junit.*; import gplx.core.tests.*;
-public class Xoh_toc_wtr__skip__tst {
-	@Before public void init() {fxt.Clear();} private final    Xoh_toc_wtr_fxt fxt = new Xoh_toc_wtr_fxt();
-	@Test   public void Comment() {
-		fxt.Test__convert("<!--a-->", "");
-	}
-	@Test   public void Comment__many() {
-		fxt.Test__convert("1<!--2-->3<!--4-->5", "135");
-	}
-	@Test   public void Comment__dangling() {
-		fxt.Test__convert("1<!--2-->3<!--4->5", "13<!--4->5");
-	}
-	@Test   public void Br() {
-		fxt.Test__convert("a<br/>b", "ab");
-	}
-	@Test   public void H2() {
-		fxt.Test__convert("a<h2>b</h2>c", "ac");
-	}
-	@Test   public void Li() {
-		fxt.Test__convert("a<ul><li>b</li></ul>c", "ac");
-	}
-	@Test   public void Table() {
-		fxt.Test__convert("a<table><tr><td>b</td></tr></table>c", "ac");
-	}
-	@Test   public void Xnde__small() {
-		fxt.Test__convert("<small>a</small>", "a");
-	}
-	@Test   public void Xnde__sup() {
-		fxt.Test__convert("<sup>a</sup>", "a");
-	}
-	@Test   public void Translate() {	// PURPOSE: <translate> is an xtn and parses its innerText separately; meanwhile, toc_mgr defaults to using the innerText to build toc; EX:Wikidata:Introduction; DATE:2013-07-16
-		fxt.Test__convert("<translate><!--b-->ac</translate>", "ac");
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xow_toc_mgr.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xow_toc_mgr.java
index c28f22c81..b9f649d9c 100644
--- a/400_xowa/src/gplx/xowa/htmls/tocs/Xow_toc_mgr.java
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xow_toc_mgr.java
@@ -180,7 +180,7 @@ public class Xow_toc_mgr implements gplx.core.brys.Bfr_arg {
 					break;
 				case Xop_tkn_itm_.Tid_apos:				html_wtr.Apos		(ctx, html_wtr_opts, bfr, src, (Xop_apos_tkn)sub); break;
 				case Xop_tkn_itm_.Tid_html_ncr:			html_wtr.Html_ncr	(ctx, html_wtr_opts, bfr, src, (Xop_amp_tkn_num)sub); break;
-				case Xop_tkn_itm_.Tid_html_ref:			html_wtr.Html_ref	(ctx, html_wtr_opts, bfr, src, (Xop_amp_tkn_txt)sub); break;
+				case Xop_tkn_itm_.Tid_html_ref:			html_wtr.Html_ref	(ctx, html_wtr_opts, bfr, src, (Xop_amp_tkn_ent)sub); break;
 				default:
 					if (sub.Subs_len() == 0)	// NOTE: never call html_wtr directly unless leaf elem; DATE:2014-06-22
 						html_wtr.Write_tkn(bfr, ctx, html_wtr_opts, src, tkn, Xoh_html_wtr.Sub_idx_null, sub);
@@ -190,7 +190,7 @@ public class Xow_toc_mgr implements gplx.core.brys.Bfr_arg {
 			}
 		}
 	}
-	public void Html(Xoae_page page, Xoh_wtr_ctx hctx, byte[] src, Bry_bfr bfr, boolean write_toc_cls) {
+	public void Html(Xoae_page page, Xoh_wtr_ctx hctx, byte[] src, Bry_bfr bfr, boolean write_toc_cls) {	// write_toc_cls needed for Page_banner
 		if (!page.Hdr_mgr().Toc_enabled()) return;	// REF.MW: Parser.php|formatHeadings
 		if (hctx.Mode_is_hdump()) return;
 		this.page = page;
diff --git a/400_xowa/src/gplx/xowa/htmls/tocs/Xow_toc_mgr_tst.java b/400_xowa/src/gplx/xowa/htmls/tocs/Xow_toc_mgr_tst.java
index d201dd2a5..0db2f31fa 100644
--- a/400_xowa/src/gplx/xowa/htmls/tocs/Xow_toc_mgr_tst.java
+++ b/400_xowa/src/gplx/xowa/htmls/tocs/Xow_toc_mgr_tst.java
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
 import org.junit.*; import gplx.xowa.parsers.*; import gplx.xowa.htmls.core.htmls.*;
-public class Xow_toc_mgr_tst {		
+public class Xow_toc_mgr_tst {
 	@Before public void init() {fxt.Clear();} private final    Xow_toc_mgr_fxt fxt = new Xow_toc_mgr_fxt();
 	@Test   public void Basic() {
 		fxt.Test_html_toc(String_.Concat_lines_nl_skip_last
@@ -173,7 +173,7 @@ public class Xow_toc_mgr_tst {
 		, "  </ul>"
 		));
 	}
-	@Test   public void Encode() {
+	@Test   public void Id__encode() {
 		fxt.Test_html_toc(String_.Concat_lines_nl_skip_last
 		( "__FORCETOC__"
 		, "==a+b=="
@@ -215,7 +215,7 @@ public class Xow_toc_mgr_tst {
 		, ""
 		));
 	}
-	@Test   public void Xnde_italic() {
+	@Test   public void Xnde__italic() {
 		fxt.Test_html_all(String_.Concat_lines_nl_skip_last
 		( "__FORCETOC__"
 		, "==<i>a</i>=="
@@ -230,7 +230,7 @@ public class Xow_toc_mgr_tst {
 		, "<h2><span class='mw-headline' id='a'><i>a</i></span></h2>"
 		));
 	}
-	@Test   public void Xnde_small() {
+	@Test   public void Xnde__small() {
 		fxt.Test_html_all(String_.Concat_lines_nl_skip_last
 		( "__FORCETOC__"
 		, "==<small>a</small>=="
@@ -245,7 +245,61 @@ public class Xow_toc_mgr_tst {
 		, "<h2><span class='mw-headline' id='a'><small>a</small></span></h2>"
 		));
 	}
-	@Test   public void Xnde_dangling() {	// PURPOSE: do not render dangling xndes; EX: Casualties_of_the_Iraq_War; ===<small>Iraqi Health Ministry<small>===
+	@Test   public void Xnde__li() {
+		fxt.Test_html_all(String_.Concat_lines_nl_skip_last
+		( "__FORCETOC__"
+		, "==a<ul><li>b</li></ul>c=="
+		)
+		, String_.Concat_lines_nl
+		( fxt.toc_tbl_nl_n
+		( "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#abc\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">ac</span></a>"	// NOTE: toctext should be "abc", not "ab"
+		, "    </li>"
+		, "  </ul>"
+		)
+		, "<h2><span class='mw-headline' id='abc'>a<ul>"
+		, "<li>b</li></ul>c</span></h2>"
+		));
+	}
+	@Test   public void Xnde__table() {
+		fxt.Test_html_all(String_.Concat_lines_nl_skip_last
+		( "__FORCETOC__"
+		, "==a<table><tr><td>b</td></tr></table>c=="
+		)
+		, String_.Concat_lines_nl
+		( fxt.toc_tbl_nl_n
+		( "  <ul>"
+		, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#a.3Ctable.3E.3Ctr.3E.3Ctd.3Eb.3C.2Ftd.3E.3C.2Ftr.3E.3C.2Ftable.3Ec\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">abc</span></a>"	// NOTE: toc id should be "abc"
+		, "    </li>"
+		, "  </ul>"
+		)
+		, "<h2><span class='mw-headline' id='a.3Ctable.3E.3Ctr.3E.3Ctd.3Eb.3C.2Ftd.3E.3C.2Ftr.3E.3C.2Ftable.3Ec'>a"
+		, "<table>"
+		, "  <tr>"
+		, "    <td>b"
+		, "    </td>"
+		, "  </tr>"
+		, "</table>"
+		, "c</span></h2>"
+		));
+	}
+	// TOMBSTONE: on MW, shows up as 'href="#ab"; <span class="toctext">ab</span>; '; TIDY doing strange things; ignore for now; DATE:2016-06-28
+	//@Test   public void Xnde__h2() {
+	//	fxt.Test_html_all(String_.Concat_lines_nl_skip_last
+	//	( "__FORCETOC__"
+	//	, "==a<h2>b</h2>c=="
+	//	)
+	//	, String_.Concat_lines_nl
+	//	( fxt.toc_tbl_nl_n
+	//	( "  <ul>"
+	//	, "    <li class=\"toclevel-1 tocsection-1\"><a href=\"#abc\"><span class=\"tocnumber\">1</span> <span class=\"toctext\">ac</span></a>"
+	//	, "    </li>"
+	//	, "  </ul>"
+	//	)
+	//	, "<h2><span class='mw-headline' id='abc'>a<h2>b</h2>c</span></h2>"
+	//	));
+	//}
+	@Test   public void Xnde__dangling() {	// PURPOSE: do not render dangling xndes; EX: Casualties_of_the_Iraq_War; ===<small>Iraqi Health Ministry<small>===
 		fxt.Test_html_all(String_.Concat_lines_nl_skip_last
 		( "__FORCETOC__"
 		, "==<small>a<small>=="
@@ -260,7 +314,7 @@ public class Xow_toc_mgr_tst {
 		, "<h2><span class='mw-headline' id='a'><small>a<small></small></small></span></h2>"
 		));
 	}
-	@Test   public void Xnde_nest_xnde() {
+	@Test   public void Nest__xnde__small() {
 		fxt.Test_html_all(String_.Concat_lines_nl_skip_last
 		( "__FORCETOC__"
 		, "==a <sup>b<small>c</small>d</sup> e=="
@@ -275,7 +329,7 @@ public class Xow_toc_mgr_tst {
 		, "<h2><span class='mw-headline' id='a_bcd_e'>a <sup>b<small>c</small>d</sup> e</span></h2>"
 		));
 	}
-	@Test   public void Xnde_nest_lnki() {
+	@Test   public void Nest__lnki() {
 		fxt.Test_html_all(String_.Concat_lines_nl_skip_last
 		( "__FORCETOC__"
 		, "==<small>[[a|b]]</small>=="
@@ -290,7 +344,7 @@ public class Xow_toc_mgr_tst {
 		, "<h2><span class='mw-headline' id='b'><small><a href=\"/wiki/A\">b</a></small></span></h2>"
 		));
 	}
-	@Test   public void Xnde_nest_inline() {	// PURPOSE: do not render inline xndes; EX: Magnetic_resonance_imaging
+	@Test   public void Nest__br() {	// PURPOSE: do not render inline xndes; EX: Magnetic_resonance_imaging
 		fxt.Test_html_all(String_.Concat_lines_nl_skip_last
 		( "__FORCETOC__"
 		, "==a<span id=\"b\">b<br/></span>=="
diff --git a/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java b/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java
index 0e932181d..56e3b8dc9 100644
--- a/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java
+++ b/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java
@@ -32,6 +32,10 @@ public class Xoa_lang_mgr implements Gfo_invk {
 	public Xol_lang_itm				Get_at(int i)				{return (Xol_lang_itm)hash.Get_at(i);}
 	public Xol_lang_itm				Get_by(byte[] key)			{return (Xol_lang_itm)hash.Get_by(key);}
 	public Xol_lang_itm				Get_by_or_load(byte[] key)	{return Get_by_or_new(key).Init_by_load_assert();}
+	public Xol_lang_itm				Get_by_or_en(byte[] key) {	// called by Xowv_wiki for its .Lang()
+		Xol_lang_itm rv = Get_by(key);
+		return rv == null ? lang_en : rv;
+	}
 	public Xol_lang_itm				Get_by_or_new(byte[] key) {
 		Xol_lang_itm rv = Get_by(key);
 		if (rv == null) {
diff --git a/400_xowa/src/gplx/xowa/parsers/Xop_tkn_mkr.java b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_mkr.java
index d45fc7ce0..bf223080d 100644
--- a/400_xowa/src/gplx/xowa/parsers/Xop_tkn_mkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_mkr.java
@@ -25,7 +25,7 @@ public class Xop_tkn_mkr {
 	public Xop_space_tkn Space_mutable(int bgn, int end)									{return new Xop_space_tkn(false, bgn, end);}
 	public Xop_apos_tkn Apos(int bgn, int end
 		, int aposLen, int typ, int cmd, int lit_apos)										{return new Xop_apos_tkn(bgn, end, aposLen, typ, cmd, lit_apos);}
-	public Xop_tkn_itm Amp_txt(int bgn, int end, Xop_amp_trie_itm itm)						{return new Xop_amp_tkn_txt(bgn, end, itm);}
+	public Xop_tkn_itm Amp_txt(int bgn, int end, Xop_amp_trie_itm itm)						{return new Xop_amp_tkn_ent(bgn, end, itm);}
 	public Xop_tkn_itm Amp_num(int bgn, int end, int val_int, byte[] val_bry)				{return new Xop_amp_tkn_num(bgn, end, val_int, val_bry);}
 	public Xop_tkn_itm Amp_num(int bgn, int end, int val_int)								{return new Xop_amp_tkn_num(bgn, end, val_int, gplx.core.intls.Utf16_.Encode_int_to_bry(val_int));}
 	public Xop_nl_tkn NewLine(int bgn, int end, byte nl_typ, int nl_len)					{return new Xop_nl_tkn(bgn, end, nl_typ, nl_len);}
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr.java
index f7fdf54bc..44c9a21c4 100644
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr.java
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr.java
@@ -17,113 +17,189 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
 import gplx.core.btries.*;
-public class Xop_amp_mgr {
-	private final    Object thread_lock_1 = new Object(), thread_lock_2 = new Object();
-	private final    Bry_bfr tmp_bfr = Bry_bfr_.Reset(32);
+public class Xop_amp_mgr {	// TS
 	public Btrie_slim_mgr Amp_trie() {return amp_trie;} private final    Btrie_slim_mgr amp_trie = Xop_amp_trie.Instance;
-	public int Rslt_pos() {return rslt_pos;} private int rslt_pos;
-	public int Rslt_val() {return rslt_val;} private int rslt_val;
-	public Xop_tkn_itm Parse_as_tkn(Xop_tkn_mkr tkn_mkr, byte[] src, int src_len, int amp_pos, int cur_pos) {
-		synchronized (thread_lock_1) {
-			rslt_pos = amp_pos + 1;	// default to fail pos; after amp;
-			Object o = amp_trie.Match_bgn(src, cur_pos, src_len);
-			cur_pos = amp_trie.Match_pos();
-			if (o == null) return null;
-			Xop_amp_trie_itm itm = (Xop_amp_trie_itm)o;
-			switch (itm.Tid()) {
-				case Xop_amp_trie_itm.Tid_name_std:
-				case Xop_amp_trie_itm.Tid_name_xowa:
-					rslt_pos = cur_pos;
-					return tkn_mkr.Amp_txt(amp_pos, cur_pos, itm);
-				case Xop_amp_trie_itm.Tid_num_hex:
-				case Xop_amp_trie_itm.Tid_num_dec:
-					boolean ncr_is_hex = itm.Tid() == Xop_amp_trie_itm.Tid_num_hex;
-					boolean pass = Parse_as_int(ncr_is_hex, src, src_len, amp_pos, cur_pos);
-					return pass ? tkn_mkr.Amp_num(amp_pos, rslt_pos, rslt_val) : null;
-				default: throw Err_.new_unhandled(itm.Tid());
-			}
+	public Xop_amp_mgr_rslt Parse_tkn(Xop_tkn_mkr tkn_mkr, byte[] src, int src_len, int amp_pos, int bgn) {
+		int fail_pos = amp_pos + 1;	// default to fail pos which is after &
+
+		// check amp_trie; EX: 'lt'
+		Xop_amp_mgr_rslt rv = new Xop_amp_mgr_rslt();
+		Btrie_rv match = amp_trie.Match_at(src, bgn, src_len);
+		Xop_amp_trie_itm itm = (Xop_amp_trie_itm)match.Obj();
+		int cur = match.Pos();
+		match.Pool__rls();
+		if (itm == null) {
+			rv.Pass_n_(fail_pos);
+			return rv;
 		}
-	}
-	public boolean Parse_as_int(boolean ncr_is_hex, byte[] src, int src_len, int amp_pos, int int_bgn) {
-		synchronized (thread_lock_2) {
-			rslt_pos = amp_pos + 1;	// default to fail pos; after amp;
-			rslt_val = -1;			// clear any previous setting
-			int cur_pos = int_bgn, int_end = -1;
-			int semic_pos = Bry_find_.Find_fwd(src, Byte_ascii.Semic, cur_pos, src_len);
-			if (semic_pos == Bry_find_.Not_found) return false;
-			int_end = semic_pos - 1;	// int_end = pos before semicolon
-			int multiple = ncr_is_hex ? 16 : 10, val = 0, factor = 1, cur = 0;
-			for (int i = int_end; i >= int_bgn; i--) {
-				byte b = src[i];
-				if (ncr_is_hex) {
-					if		(b >=  48 && b <=  57)	cur = b - 48;
-					else if	(b >=  65 && b <=  70)	cur = b - 55;
-					else if	(b >=  97 && b <= 102)	cur = b - 87;
-					else if((b >=  71 && b <=  90)
-						||  (b >=  91 && b <= 122))	continue;	// NOTE: wiki discards letters G-Z; PAGE:en.w:Miscellaneous_Symbols "{{Unicode|&#xx26D0;}}"; NOTE 2nd x is discarded
-					else							return false;
+
+		// check itm
+		switch (itm.Tid()) {
+			// letters; EX: '&lt;'
+			case Xop_amp_trie_itm.Tid_name_std:
+			case Xop_amp_trie_itm.Tid_name_xowa:
+				rv.Pos_(cur);
+				rv.Tkn_(tkn_mkr.Amp_txt(amp_pos, cur, itm));
+				return rv;
+			// numbers; EX: '&#123;' '&#x123'
+			case Xop_amp_trie_itm.Tid_num_hex:
+			case Xop_amp_trie_itm.Tid_num_dec:
+				boolean ncr_is_hex = itm.Tid() == Xop_amp_trie_itm.Tid_num_hex;
+				boolean pass = Parse_ncr(rv, ncr_is_hex, src, src_len, amp_pos, cur);
+				if (pass) {	// NOTE: do not set rv.Pos_(); will be set by Parse_ncr
+					rv.Tkn_(tkn_mkr.Amp_num(amp_pos, rv.Pos(), rv.Val()));
+					return rv;
 				}
 				else {
-					cur = b - Byte_ascii.Num_0;
-					if (cur < 0 || cur > 10)		return false;
+					rv.Pass_n_(fail_pos);
+					return rv;
 				}
-				val += cur * factor;
-				if (val > gplx.core.intls.Utf8_.Codepoint_max)  return false;	// fail if value > largest_unicode_codepoint
-				factor *= multiple;
-			}
-			rslt_val = val;
-			rslt_pos = semic_pos + 1;	// position after semic
-			return true;
+			default: throw Err_.new_unhandled_default(itm.Tid());
 		}
 	}
+	public boolean Parse_ncr(Xop_amp_mgr_rslt rv, boolean ncr_is_hex, byte[] src, int src_len, int amp_pos, int num_bgn) {
+		int fail_pos = amp_pos + 1;	// default to fail pos; after amp;
+
+		// find semic; fail if none found
+		int semic_pos = Bry_find_.Find_fwd(src, Byte_ascii.Semic, num_bgn, src_len);
+		if (semic_pos == Bry_find_.Not_found) return rv.Pass_n_(fail_pos);
+		int num_end = semic_pos - 1;	// num_end = pos before semicolon
+
+		// calc amp_val; EX: &#x3A3; -> 931; &#931; -> 931;
+		int multiple = ncr_is_hex ? 16 : 10, val = 0, factor = 1, cur = 0;
+		for (int i = num_end; i >= num_bgn; i--) {
+			byte b = src[i];
+			if (ncr_is_hex) {
+				if		(b >=  48 && b <=  57)	cur = b - 48;
+				else if	(b >=  65 && b <=  70)	cur = b - 55;
+				else if	(b >=  97 && b <= 102)	cur = b - 87;
+				else if((b >=  71 && b <=  90)
+					||  (b >=  91 && b <= 122))	continue;	// NOTE: wiki discards letters G-Z; PAGE:en.w:Miscellaneous_Symbols "{{Unicode|&#xx26D0;}}"; NOTE 2nd x is discarded
+				else							return rv.Pass_n_(fail_pos);
+			}
+			else {
+				cur = b - Byte_ascii.Num_0;
+				if (cur < 0 || cur > 10)		return rv.Pass_n_(fail_pos);
+			}
+			val += cur * factor;
+			if (val > gplx.core.intls.Utf8_.Codepoint_max) return rv.Pass_n_(fail_pos);	// fail if value > largest_unicode_codepoint
+			factor *= multiple;
+		}
+		return rv.Pass_y_(semic_pos + 1, val);	// +1 to position after semic
+	}
 	public byte[] Decode_as_bry(byte[] src) {
 		if (src == null) return src;
-		int src_len = src.length;
 		boolean dirty = false;
+		int end = src.length;
 		int pos = 0;
-		synchronized (tmp_bfr) {
-			while (pos < src_len) {
-				byte b = src[pos];
-				if (b == Byte_ascii.Amp) {
-					int nxt_pos = pos + 1;
-					if (nxt_pos < src_len) {
-						byte nxt_b = src[nxt_pos];
-						Object amp_obj = amp_trie.Match_bgn_w_byte(nxt_b, src, nxt_pos, src_len);
-						if (amp_obj != null) {
-							if (!dirty) {
-								tmp_bfr.Add_mid(src, 0, pos);
+		Xop_amp_mgr_rslt amp_rv = null;
+		Bry_bfr bfr = null;
+
+		// scan for &
+		while (pos < end) {
+			byte b = src[pos];
+			if (b == Byte_ascii.Amp) {	// & found
+				int nxt_pos = pos + 1;
+				if (nxt_pos < end) {	// check & is not eos
+					byte nxt_b = src[nxt_pos];
+
+					Btrie_rv trie_rv = amp_trie.Match_at_w_b0(nxt_b, src, nxt_pos, end);
+					Object amp_obj = trie_rv.Obj();
+					int amp_pos = trie_rv.Pos();
+					trie_rv.Pool__rls();
+					if (amp_obj != null) {
+						if (!dirty) {	// 1st amp found; add preceding String to bfr
+							if (bfr == null) {
+								bfr = Bry_bfr_.Get();
 								dirty = true;
 							}
-							Xop_amp_trie_itm amp_itm = (Xop_amp_trie_itm)amp_obj;
-							switch (amp_itm.Tid()) {
-								case Xop_amp_trie_itm.Tid_name_std:
-								case Xop_amp_trie_itm.Tid_name_xowa:
-									tmp_bfr.Add(amp_itm.U8_bry());
-									pos = amp_trie.Match_pos();
-									break;
-								case Xop_amp_trie_itm.Tid_num_hex:
-								case Xop_amp_trie_itm.Tid_num_dec:
-									boolean ncr_is_hex = amp_itm.Tid() == Xop_amp_trie_itm.Tid_num_hex;
-									int int_bgn = amp_trie.Match_pos();
-									if (Parse_as_int(ncr_is_hex, src, src_len, pos, int_bgn))
-										tmp_bfr.Add_u8_int(rslt_val);
-									else 
-										tmp_bfr.Add_mid(src, pos, nxt_pos);
-									pos = rslt_pos;
-									break;
-								default:
-									throw Err_.new_unhandled(amp_itm.Tid());
-							}
-							continue;
+							bfr.Add_mid(src, 0, pos);
 						}
-					}					
-				}
-				if (dirty)
-					tmp_bfr.Add_byte(b);
-				++pos;
+						Xop_amp_trie_itm amp_itm = (Xop_amp_trie_itm)amp_obj;
+						switch (amp_itm.Tid()) {
+							case Xop_amp_trie_itm.Tid_name_std:
+							case Xop_amp_trie_itm.Tid_name_xowa:
+								bfr.Add(amp_itm.U8_bry());
+								pos = amp_pos;
+								break;
+							case Xop_amp_trie_itm.Tid_num_hex:
+							case Xop_amp_trie_itm.Tid_num_dec:
+								boolean ncr_is_hex = amp_itm.Tid() == Xop_amp_trie_itm.Tid_num_hex;
+								int int_bgn = amp_pos;
+								if (amp_rv == null)
+									amp_rv = new Xop_amp_mgr_rslt();
+								boolean pass = Parse_ncr(amp_rv, ncr_is_hex, src, end, pos, int_bgn);
+								if (pass)
+									bfr.Add_u8_int(amp_rv.Val());
+								else 
+									bfr.Add_mid(src, pos, nxt_pos);
+								pos = amp_rv.Pos();
+								break;
+							default:
+								throw Err_.new_unhandled_default(amp_itm.Tid());
+						}
+						continue;
+					}
+				}					
 			}
-			return dirty ? tmp_bfr.To_bry_and_clear() : src;
+			if (dirty)
+				bfr.Add_byte(b);
+			++pos;
 		}
+		return dirty ? bfr.To_bry_and_clear_and_rls() : src;
 	}
         public static final    Xop_amp_mgr Instance = new Xop_amp_mgr(); Xop_amp_mgr() {}
+//		private Xop_tkn_itm Parse_as_tkn_old(Xop_tkn_mkr tkn_mkr, byte[] src, int src_len, int amp_pos, int cur_pos) {
+//			synchronized (thread_lock_1) {
+//				rv_pos = amp_pos + 1;	// default to fail pos; after amp;
+//				Object o = amp_trie.Match_bgn(src, cur_pos, src_len);
+//				cur_pos = amp_trie.Match_pos();
+//				if (o == null) return null;
+//				Xop_amp_trie_itm itm = (Xop_amp_trie_itm)o;
+//				switch (itm.Tid()) {
+//					case Xop_amp_trie_itm.Tid_name_std:
+//					case Xop_amp_trie_itm.Tid_name_xowa:
+//						rv_pos = cur_pos;
+//						return tkn_mkr.Amp_txt(amp_pos, cur_pos, itm);
+//					case Xop_amp_trie_itm.Tid_num_hex:
+//					case Xop_amp_trie_itm.Tid_num_dec:
+//						boolean ncr_is_hex = itm.Tid() == Xop_amp_trie_itm.Tid_num_hex;
+//						Xop_amp_mgr_rslt rv = Parse_as_int2(ncr_is_hex, src, src_len, amp_pos, cur_pos);
+//						return rv.Pass() ? tkn_mkr.Amp_num(amp_pos, rv_pos, rslt_val) : null;
+//					default: throw Err_.new_unhandled(itm.Tid());
+//				}
+//			}
+//		}
+//		private boolean Parse_as_int_old(boolean ncr_is_hex, byte[] src, int src_len, int amp_pos, int int_bgn) {
+//			synchronized (thread_lock_2) {
+//				rv_pos = amp_pos + 1;	// default to fail pos; after amp;
+//				rslt_val = -1;			// clear any previous setting
+//				int cur_pos = int_bgn, int_end = -1;
+//				int semic_pos = Bry_find_.Find_fwd(src, Byte_ascii.Semic, cur_pos, src_len);
+//				if (semic_pos == Bry_find_.Not_found) return false;
+//				int_end = semic_pos - 1;	// int_end = pos before semicolon
+//				int multiple = ncr_is_hex ? 16 : 10, val = 0, factor = 1, cur = 0;
+//				for (int i = int_end; i >= int_bgn; i--) {
+//					byte b = src[i];
+//					if (ncr_is_hex) {
+//						if		(b >=  48 && b <=  57)	cur = b - 48;
+//						else if	(b >=  65 && b <=  70)	cur = b - 55;
+//						else if	(b >=  97 && b <= 102)	cur = b - 87;
+//						else if((b >=  71 && b <=  90)
+//							||  (b >=  91 && b <= 122))	continue;	// NOTE: wiki discards letters G-Z; PAGE:en.w:Miscellaneous_Symbols "{{Unicode|&#xx26D0;}}"; NOTE 2nd x is discarded
+//						else							return false;
+//					}
+//					else {
+//						cur = b - Byte_ascii.Num_0;
+//						if (cur < 0 || cur > 10)		return false;
+//					}
+//					val += cur * factor;
+//					if (val > gplx.core.intls.Utf8_.Codepoint_max)  return false;	// fail if value > largest_unicode_codepoint
+//					factor *= multiple;
+//				}
+//				rslt_val = val;
+//				rv_pos = semic_pos + 1;	// position after semic
+//				return true;
+//			}
+//		}
 }
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr__decode__tst.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr__decode__tst.java
new file mode 100644
index 000000000..a4e1c9974
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr__decode__tst.java
@@ -0,0 +1,64 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+import org.junit.*; import gplx.core.tests.*;
+public class Xop_amp_mgr__decode__tst {
+	@Before public void init() {} private final    Xop_amp_mgr_fxt fxt = new Xop_amp_mgr_fxt();
+	@Test  public void Text()						{fxt.Test__decode_as_bry("a"				, "a");}
+	@Test  public void Name()						{fxt.Test__decode_as_bry("&amp;"			, "&");}
+	@Test  public void Name_w_text()				{fxt.Test__decode_as_bry("a&amp;b"			, "a&b");}
+	@Test  public void Name_fail_semic_missing()	{fxt.Test__decode_as_bry("a&ampb"			, "a&ampb");}
+	@Test  public void Name_fail_amp_only()			{fxt.Test__decode_as_bry("a&"				, "a&");}
+	@Test  public void Num_fail()					{fxt.Test__decode_as_bry("&#!;"				, "&#!;");}		// ! is not valid num
+	@Test  public void Hex_fail()					{fxt.Test__decode_as_bry("&#x!;"			, "&#x!;");}	// ! is not valid hex
+	@Test  public void Num_basic()					{fxt.Test__decode_as_bry("&#0931;"			, "Σ");}
+	@Test  public void Num_zero_padded()			{fxt.Test__decode_as_bry("&#00931;"			, "Σ");}
+	@Test  public void Hex_upper()					{fxt.Test__decode_as_bry("&#x3A3;"			, "Σ");}
+	@Test  public void Hex_lower()					{fxt.Test__decode_as_bry("&#x3a3;"			, "Σ");}
+	@Test  public void Hex_zero_padded()			{fxt.Test__decode_as_bry("&#x03a3;"			, "Σ");}
+	@Test  public void Hex_upper_x()				{fxt.Test__decode_as_bry("&#X3A3;"			, "Σ");}
+	@Test  public void Num_fail_large_codepoint()	{fxt.Test__decode_as_bry("&#538189831;"		, "&#538189831;");}
+	@Test  public void Num_ignore_extra_x()			{fxt.Test__decode_as_bry("&#xx26D0;"		, Char_.To_str(Char_.By_int(9936)));}	// 2nd x is ignored
+}
+class Xop_amp_mgr_fxt {
+	private final    Xop_amp_mgr amp_mgr = Xop_amp_mgr.Instance;
+	public void Test__decode_as_bry(String raw, String expd) {
+		Gftest.Eq__str(expd, String_.new_u8(amp_mgr.Decode_as_bry(Bry_.new_u8(raw))));
+	}
+	public void Test__parse_tkn__ent(String raw, String expd) {
+		Xop_amp_mgr_rslt rv = Exec__parse_tkn(raw);
+		Xop_amp_tkn_ent tkn = (Xop_amp_tkn_ent)rv.Tkn();
+		Gftest.Eq__byte(Xop_tkn_itm_.Tid_html_ref, tkn.Tkn_tid());
+		Gftest.Eq__str(expd, tkn.Xml_name_bry());
+	}
+	public void Test__parse_tkn__ncr(String raw, int expd) {
+		Xop_amp_mgr_rslt rv = Exec__parse_tkn(raw);
+		Xop_amp_tkn_num tkn = (Xop_amp_tkn_num)rv.Tkn();
+		Gftest.Eq__byte(Xop_tkn_itm_.Tid_html_ncr, tkn.Tkn_tid());
+		Gftest.Eq__int(expd, tkn.Val());
+	}
+	public void Test__parse_tkn__txt(String raw, int expd) {
+		Xop_amp_mgr_rslt rv = Exec__parse_tkn(raw);
+		Gftest.Eq__null(Bool_.Y, rv.Tkn());
+		Gftest.Eq__int(expd, rv.Pos());
+	}
+	private Xop_amp_mgr_rslt Exec__parse_tkn(String raw) {
+		byte[] src = Bry_.new_u8(raw);
+		return amp_mgr.Parse_tkn(new Xop_tkn_mkr(), src, src.length, 0, 1);
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_txt_tkn_chkr.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr__parse_tkn__tst.java
similarity index 54%
rename from 400_xowa/src/gplx/xowa/parsers/amps/Xop_html_txt_tkn_chkr.java
rename to 400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr__parse_tkn__tst.java
index cde656e7f..92bc113a5 100644
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_txt_tkn_chkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr__parse_tkn__tst.java
@@ -16,14 +16,12 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
-import gplx.core.tests.*;
-public class Xop_html_txt_tkn_chkr extends Xop_tkn_chkr_base {
-	@Override public Class<?> TypeOf() {return Xop_amp_tkn_txt.class;}
-	@Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_html_ref;}
-	public String Html_ref_key() {return html_ref_key;} public Xop_html_txt_tkn_chkr Html_ref_key_(String v) {html_ref_key = v; return this;} private String html_ref_key;
-	@Override public int Chk_hook(Tst_mgr mgr, String path, Object actl_obj, int err) {
-		Xop_amp_tkn_txt actl = (Xop_amp_tkn_txt)actl_obj;
-		err += mgr.Tst_val(html_ref_key == null, path, "html_ref_key", html_ref_key, String_.new_u8(actl.Xml_name_bry()));
-		return err;
-	}
+import org.junit.*; import gplx.core.tests.*;
+public class Xop_amp_mgr__parse_tkn__tst {
+	@Before public void init() {} private final    Xop_amp_mgr_fxt fxt = new Xop_amp_mgr_fxt();
+	@Test  public void Ent()					{fxt.Test__parse_tkn__ent("&amp;"		, "&amp;");}	// check for html_ref 
+	@Test  public void Ent__fail()				{fxt.Test__parse_tkn__txt("&nil;"		, 1);}
+	@Test  public void Num__nex()				{fxt.Test__parse_tkn__ncr("&#x3A3;"		, 931);}		// check for html_ncr; Σ: http://en.wikipedia.org/wiki/Numeric_character_reference
+	@Test  public void Num__dec()				{fxt.Test__parse_tkn__ncr("&#931;"		, 931);}
+	@Test  public void Num__fail()				{fxt.Test__parse_tkn__txt("&#"			, 1);}
 }
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr_decode_tst.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr_decode_tst.java
deleted file mode 100644
index b9ec794d1..000000000
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr_decode_tst.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
-import org.junit.*;
-public class Xop_amp_mgr_decode_tst {
-	@Before public void init() {fxt.Reset();} private Xop_amp_mgr_fxt fxt = new Xop_amp_mgr_fxt();
-	@Test  public void Text()						{fxt.Test_decode_as_bry("a"					, "a");}
-	@Test  public void Name()						{fxt.Test_decode_as_bry("&amp;"				, "&");}
-	@Test  public void Name_w_text()				{fxt.Test_decode_as_bry("a&amp;b"			, "a&b");}
-	@Test  public void Name_fail_semic_missing()	{fxt.Test_decode_as_bry("a&ampb"			, "a&ampb");}
-	@Test  public void Name_fail_amp_only()			{fxt.Test_decode_as_bry("a&"				, "a&");}
-	@Test  public void Num_fail()					{fxt.Test_decode_as_bry("&#!;"				, "&#!;");}		// ! is not valid num
-	@Test  public void Hex_fail()					{fxt.Test_decode_as_bry("&#x!;"				, "&#x!;");}	// ! is not valid hex
-	@Test  public void Num_basic()					{fxt.Test_decode_as_bry("&#0931;"			, "Σ");}
-	@Test  public void Num_zero_padded()			{fxt.Test_decode_as_bry("&#00931;"			, "Σ");}
-	@Test  public void Hex_upper()					{fxt.Test_decode_as_bry("&#x3A3;"			, "Σ");}
-	@Test  public void Hex_lower()					{fxt.Test_decode_as_bry("&#x3a3;"			, "Σ");}
-	@Test  public void Hex_zero_padded()			{fxt.Test_decode_as_bry("&#x03a3;"			, "Σ");}
-	@Test  public void Hex_upper_x()				{fxt.Test_decode_as_bry("&#X3A3;"			, "Σ");}
-	@Test  public void Num_fail_large_codepoint()	{fxt.Test_decode_as_bry("&#538189831;"		, "&#538189831;");}
-	@Test  public void Num_ignore_extra_x()			{fxt.Test_decode_as_bry("&#xx26D0;"			, Char_.To_str(Char_.By_int(9936)));}	// 2nd x is ignored
-}
-class Xop_amp_mgr_fxt {
-	private Xop_amp_mgr amp_mgr = Xop_amp_mgr.Instance;
-	public void Reset() {}
-	public void Test_decode_as_bry(String raw, String expd) {
-		Tfds.Eq(expd, String_.new_u8(amp_mgr.Decode_as_bry(Bry_.new_u8(raw))));
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr_rslt.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr_rslt.java
new file mode 100644
index 000000000..0f817f8d5
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_mgr_rslt.java
@@ -0,0 +1,42 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+public class Xop_amp_mgr_rslt {
+	public Xop_amp_mgr_rslt(int pos, int val, Xop_tkn_itm tkn) {
+		this.pos = pos;
+		this.val = val;
+		this.tkn = tkn;
+	}
+	public Xop_amp_mgr_rslt() {}
+	public boolean Pass() {return pass;} private boolean pass; public void Valid_(boolean v) {this.pass = v;} 
+	public int Pos() {return pos;} private int pos; public void Pos_(int v) {this.pos = v;}
+	public int Val() {return val;} private int val; public void Val_(int v) {this.val = v;}
+	public Xop_tkn_itm Tkn() {return tkn;} private Xop_tkn_itm tkn; public void Tkn_(Xop_tkn_itm v) {this.tkn = v;}
+	public boolean Pass_y_(int pos, int val) {
+		this.pos = pos; this.val = val;
+		this.pass = true;
+		return true;
+	}
+	public boolean Pass_n_(int pos) {
+		this.pass = false;
+		this.pos = pos;
+		this.val = -1;
+		this.tkn = null;
+		return false;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_tkn_txt.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_tkn_ent.java
similarity index 91%
rename from 400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_tkn_txt.java
rename to 400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_tkn_ent.java
index 50f11cdd0..5b0474e3f 100644
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_tkn_txt.java
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_tkn_ent.java
@@ -16,9 +16,9 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
-public class Xop_amp_tkn_txt extends Xop_tkn_itm_base {
+public class Xop_amp_tkn_ent extends Xop_tkn_itm_base {
 	private Xop_amp_trie_itm html_ref_itm;
-	public Xop_amp_tkn_txt(int bgn, int end, Xop_amp_trie_itm html_ref_itm) {
+	public Xop_amp_tkn_ent(int bgn, int end, Xop_amp_trie_itm html_ref_itm) {
 		this.html_ref_itm = html_ref_itm;
 		this.Tkn_ini_pos(false, bgn, end);
 	}
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_trie.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_trie.java
index 255530f24..a017cf4c8 100644
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_trie.java
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_trie.java
@@ -17,301 +17,300 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
 import gplx.core.btries.*;
-public class Xop_amp_trie {
-	public static final byte[]		// NOTE: top_define
-	  Bry_xowa_lt			= Bry_.new_a7("&xowa_lt;")
-	, Bry_xowa_brack_bgn	= Bry_.new_a7("&xowa_brack_bgn;")
-	, Bry_xowa_brack_end	= Bry_.new_a7("&xowa_brack_end;")
-	, Bry_xowa_pipe			= Bry_.new_a7("&xowa_pipe;")
-	, Bry_xowa_apos			= Bry_.new_a7("&xowa_apos;")
-	, Bry_xowa_colon		= Bry_.new_a7("&xowa_colon;")
-	, Bry_xowa_underline	= Bry_.new_a7("&xowa_underline;")
-	, Bry_xowa_asterisk		= Bry_.new_a7("&xowa_asterisk;")
-	, Bry_xowa_space		= Bry_.new_a7("&xowa_space;")
-	, Bry_xowa_nl			= Bry_.new_a7("&xowa_nl;")
-	, Bry_xowa_dash			= Bry_.new_a7("&xowa_dash;")
+public class Xop_amp_trie {	// TS
+	public static final    String		// NOTE: top_define; entities needed for <nowiki> escaping
+	  Str__xowa_lt			= "&xowa_lt;"
+	, Str__xowa_brack_bgn	= "&xowa_brack_bgn;"
+	, Str__xowa_brack_end	= "&xowa_brack_end;"
+	, Str__xowa_pipe		= "&xowa_pipe;"
+	, Str__xowa_apos		= "&xowa_apos;"
+	, Str__xowa_colon		= "&xowa_colon;"
+	, Str__xowa_underline	= "&xowa_underline;"
+	, Str__xowa_asterisk	= "&xowa_asterisk;"
+	, Str__xowa_space		= "&xowa_space;"
+	, Str__xowa_nl			= "&xowa_nl;"
+	, Str__xowa_dash		= "&xowa_dash;"
 	;
-	public static final Btrie_slim_mgr Instance = new_(); Xop_amp_trie() {}
-	private static Btrie_slim_mgr new_() {// REF.MW: Sanitizer|$wgHtmlEntities; NOTE:added apos
+	public static final    Btrie_slim_mgr Instance = New(); Xop_amp_trie() {}
+	private static Btrie_slim_mgr New() {// REF.MW: Sanitizer|$wgHtmlEntities; NOTE:added apos
 		Btrie_slim_mgr rv = Btrie_slim_mgr.cs();
-		Reg_name(rv, Bool_.Y,   60, Bry_xowa_lt);
-		Reg_name(rv, Bool_.Y,   91, Bry_xowa_brack_bgn);
-		Reg_name(rv, Bool_.Y,   93, Bry_xowa_brack_end);
-		Reg_name(rv, Bool_.Y,  124, Bry_xowa_pipe);
-		Reg_name(rv, Bool_.Y,   39, Bry_xowa_apos);
-		Reg_name(rv, Bool_.Y,   58, Bry_xowa_colon);
-		Reg_name(rv, Bool_.Y,   95, Bry_xowa_underline);
-		Reg_name(rv, Bool_.Y,   42, Bry_xowa_asterisk);
-		Reg_name(rv, Bool_.Y,   32, Bry_xowa_space);
-		Reg_name(rv, Bool_.Y,   10, Bry_xowa_nl);
-		Reg_name(rv, Bool_.Y,   45, Bry_xowa_dash);
-		Reg_name(rv, Bool_.N,   39, "&apos;");
-		Reg_name(rv, Bool_.N,  193, "&Aacute;");
-		Reg_name(rv, Bool_.N,  225, "&aacute;");
-		Reg_name(rv, Bool_.N,  194, "&Acirc;");
-		Reg_name(rv, Bool_.N,  226, "&acirc;");
-		Reg_name(rv, Bool_.N,  180, "&acute;");
-		Reg_name(rv, Bool_.N,  198, "&AElig;");
-		Reg_name(rv, Bool_.N,  230, "&aelig;");
-		Reg_name(rv, Bool_.N,  192, "&Agrave;");
-		Reg_name(rv, Bool_.N,  224, "&agrave;");
-		Reg_name(rv, Bool_.N, 8501, "&alefsym;");
-		Reg_name(rv, Bool_.N,  913, "&Alpha;");
-		Reg_name(rv, Bool_.N,  945, "&alpha;");
-		Reg_name(rv, Bool_.N,   38, "&amp;");
-		Reg_name(rv, Bool_.N, 8743, "&and;");
-		Reg_name(rv, Bool_.N, 8736, "&ang;");
-		Reg_name(rv, Bool_.N,  197, "&Aring;");
-		Reg_name(rv, Bool_.N,  229, "&aring;");
-		Reg_name(rv, Bool_.N, 8776, "&asymp;");
-		Reg_name(rv, Bool_.N,  195, "&Atilde;");
-		Reg_name(rv, Bool_.N,  227, "&atilde;");
-		Reg_name(rv, Bool_.N,  196, "&Auml;");
-		Reg_name(rv, Bool_.N,  228, "&auml;");
-		Reg_name(rv, Bool_.N, 8222, "&bdquo;");
-		Reg_name(rv, Bool_.N,  914, "&Beta;");
-		Reg_name(rv, Bool_.N,  946, "&beta;");
-		Reg_name(rv, Bool_.N,  166, "&brvbar;");
-		Reg_name(rv, Bool_.N, 8226, "&bull;");
-		Reg_name(rv, Bool_.N, 8745, "&cap;");
-		Reg_name(rv, Bool_.N,  199, "&Ccedil;");
-		Reg_name(rv, Bool_.N,  231, "&ccedil;");
-		Reg_name(rv, Bool_.N,  184, "&cedil;");
-		Reg_name(rv, Bool_.N,  162, "&cent;");
-		Reg_name(rv, Bool_.N,  935, "&Chi;");
-		Reg_name(rv, Bool_.N,  967, "&chi;");
-		Reg_name(rv, Bool_.N,  710, "&circ;");
-		Reg_name(rv, Bool_.N, 9827, "&clubs;");
-		Reg_name(rv, Bool_.N, 8773, "&cong;");
-		Reg_name(rv, Bool_.N,  169, "&copy;");
-		Reg_name(rv, Bool_.N, 8629, "&crarr;");
-		Reg_name(rv, Bool_.N, 8746, "&cup;");
-		Reg_name(rv, Bool_.N,  164, "&curren;");
-		Reg_name(rv, Bool_.N, 8224, "&dagger;");
-		Reg_name(rv, Bool_.N, 8225, "&Dagger;");
-		Reg_name(rv, Bool_.N, 8595, "&darr;");
-		Reg_name(rv, Bool_.N, 8659, "&dArr;");
-		Reg_name(rv, Bool_.N,  176, "&deg;");
-		Reg_name(rv, Bool_.N,  916, "&Delta;");
-		Reg_name(rv, Bool_.N,  948, "&delta;");
-		Reg_name(rv, Bool_.N, 9830, "&diams;");
-		Reg_name(rv, Bool_.N,  247, "&divide;");
-		Reg_name(rv, Bool_.N,  201, "&Eacute;");
-		Reg_name(rv, Bool_.N,  233, "&eacute;");
-		Reg_name(rv, Bool_.N,  202, "&Ecirc;");
-		Reg_name(rv, Bool_.N,  234, "&ecirc;");
-		Reg_name(rv, Bool_.N,  200, "&Egrave;");
-		Reg_name(rv, Bool_.N,  232, "&egrave;");
-		Reg_name(rv, Bool_.N, 8709, "&empty;");
-		Reg_name(rv, Bool_.N, 8195, "&emsp;");
-		Reg_name(rv, Bool_.N, 8194, "&ensp;");
-		Reg_name(rv, Bool_.N,  917, "&Epsilon;");
-		Reg_name(rv, Bool_.N,  949, "&epsilon;");
-		Reg_name(rv, Bool_.N, 8801, "&equiv;");
-		Reg_name(rv, Bool_.N,  919, "&Eta;");
-		Reg_name(rv, Bool_.N,  951, "&eta;");
-		Reg_name(rv, Bool_.N,  208, "&ETH;");
-		Reg_name(rv, Bool_.N,  240, "&eth;");
-		Reg_name(rv, Bool_.N,  203, "&Euml;");
-		Reg_name(rv, Bool_.N,  235, "&euml;");
-		Reg_name(rv, Bool_.N, 8364, "&euro;");
-		Reg_name(rv, Bool_.N, 8707, "&exist;");
-		Reg_name(rv, Bool_.N,  402, "&fnof;");
-		Reg_name(rv, Bool_.N, 8704, "&forall;");
-		Reg_name(rv, Bool_.N,  189, "&frac12;");
-		Reg_name(rv, Bool_.N,  188, "&frac14;");
-		Reg_name(rv, Bool_.N,  190, "&frac34;");
-		Reg_name(rv, Bool_.N, 8260, "&frasl;");
-		Reg_name(rv, Bool_.N,  915, "&Gamma;");
-		Reg_name(rv, Bool_.N,  947, "&gamma;");
-		Reg_name(rv, Bool_.N, 8805, "&ge;");
-		Reg_name(rv, Bool_.N,   62, "&gt;");
-		Reg_name(rv, Bool_.N, 8596, "&harr;");
-		Reg_name(rv, Bool_.N, 8660, "&hArr;");
-		Reg_name(rv, Bool_.N, 9829, "&hearts;");
-		Reg_name(rv, Bool_.N, 8230, "&hellip;");
-		Reg_name(rv, Bool_.N,  205, "&Iacute;");
-		Reg_name(rv, Bool_.N,  237, "&iacute;");
-		Reg_name(rv, Bool_.N,  206, "&Icirc;");
-		Reg_name(rv, Bool_.N,  238, "&icirc;");
-		Reg_name(rv, Bool_.N,  161, "&iexcl;");
-		Reg_name(rv, Bool_.N,  204, "&Igrave;");
-		Reg_name(rv, Bool_.N,  236, "&igrave;");
-		Reg_name(rv, Bool_.N, 8465, "&image;");
-		Reg_name(rv, Bool_.N, 8734, "&infin;");
-		Reg_name(rv, Bool_.N, 8747, "&int;");
-		Reg_name(rv, Bool_.N,  921, "&Iota;");
-		Reg_name(rv, Bool_.N,  953, "&iota;");
-		Reg_name(rv, Bool_.N,  191, "&iquest;");
-		Reg_name(rv, Bool_.N, 8712, "&isin;");
-		Reg_name(rv, Bool_.N,  207, "&Iuml;");
-		Reg_name(rv, Bool_.N,  239, "&iuml;");
-		Reg_name(rv, Bool_.N,  922, "&Kappa;");
-		Reg_name(rv, Bool_.N,  954, "&kappa;");
-		Reg_name(rv, Bool_.N,  923, "&Lambda;");
-		Reg_name(rv, Bool_.N,  955, "&lambda;");
-		Reg_name(rv, Bool_.N, 9001, "&lang;");
-		Reg_name(rv, Bool_.N,  171, "&laquo;");
-		Reg_name(rv, Bool_.N, 8592, "&larr;");
-		Reg_name(rv, Bool_.N, 8656, "&lArr;");
-		Reg_name(rv, Bool_.N, 8968, "&lceil;");
-		Reg_name(rv, Bool_.N, 8220, "&ldquo;");
-		Reg_name(rv, Bool_.N, 8804, "&le;");
-		Reg_name(rv, Bool_.N, 8970, "&lfloor;");
-		Reg_name(rv, Bool_.N, 8727, "&lowast;");
-		Reg_name(rv, Bool_.N, 9674, "&loz;");
-		Reg_name(rv, Bool_.N, 8206, "&lrm;");
-		Reg_name(rv, Bool_.N, 8249, "&lsaquo;");
-		Reg_name(rv, Bool_.N, 8216, "&lsquo;");
-		Reg_name(rv, Bool_.N,   60, "&lt;");
-		Reg_name(rv, Bool_.N,  175, "&macr;");
-		Reg_name(rv, Bool_.N, 8212, "&mdash;");
-		Reg_name(rv, Bool_.N,  181, "&micro;");
-		Reg_name(rv, Bool_.N,  183, "&middot;");
-		Reg_name(rv, Bool_.N, 8722, "&minus;");
-		Reg_name(rv, Bool_.N,  924, "&Mu;");
-		Reg_name(rv, Bool_.N,  956, "&mu;");
-		Reg_name(rv, Bool_.N, 8711, "&nabla;");
-		Reg_name(rv, Bool_.N,  160, "&nbsp;");
-		Reg_name(rv, Bool_.N, 8211, "&ndash;");
-		Reg_name(rv, Bool_.N, 8800, "&ne;");
-		Reg_name(rv, Bool_.N, 8715, "&ni;");
-		Reg_name(rv, Bool_.N,  172, "&not;");
-		Reg_name(rv, Bool_.N, 8713, "&notin;");
-		Reg_name(rv, Bool_.N, 8836, "&nsub;");
-		Reg_name(rv, Bool_.N,  209, "&Ntilde;");
-		Reg_name(rv, Bool_.N,  241, "&ntilde;");
-		Reg_name(rv, Bool_.N,  925, "&Nu;");
-		Reg_name(rv, Bool_.N,  957, "&nu;");
-		Reg_name(rv, Bool_.N,  211, "&Oacute;");
-		Reg_name(rv, Bool_.N,  243, "&oacute;");
-		Reg_name(rv, Bool_.N,  212, "&Ocirc;");
-		Reg_name(rv, Bool_.N,  244, "&ocirc;");
-		Reg_name(rv, Bool_.N,  338, "&OElig;");
-		Reg_name(rv, Bool_.N,  339, "&oelig;");
-		Reg_name(rv, Bool_.N,  210, "&Ograve;");
-		Reg_name(rv, Bool_.N,  242, "&ograve;");
-		Reg_name(rv, Bool_.N, 8254, "&oline;");
-		Reg_name(rv, Bool_.N,  937, "&Omega;");
-		Reg_name(rv, Bool_.N,  969, "&omega;");
-		Reg_name(rv, Bool_.N,  927, "&Omicron;");
-		Reg_name(rv, Bool_.N,  959, "&omicron;");
-		Reg_name(rv, Bool_.N, 8853, "&oplus;");
-		Reg_name(rv, Bool_.N, 8744, "&or;");
-		Reg_name(rv, Bool_.N,  170, "&ordf;");
-		Reg_name(rv, Bool_.N,  186, "&ordm;");
-		Reg_name(rv, Bool_.N,  216, "&Oslash;");
-		Reg_name(rv, Bool_.N,  248, "&oslash;");
-		Reg_name(rv, Bool_.N,  213, "&Otilde;");
-		Reg_name(rv, Bool_.N,  245, "&otilde;");
-		Reg_name(rv, Bool_.N, 8855, "&otimes;");
-		Reg_name(rv, Bool_.N,  214, "&Ouml;");
-		Reg_name(rv, Bool_.N,  246, "&ouml;");
-		Reg_name(rv, Bool_.N,  182, "&para;");
-		Reg_name(rv, Bool_.N, 8706, "&part;");
-		Reg_name(rv, Bool_.N, 8240, "&permil;");
-		Reg_name(rv, Bool_.N, 8869, "&perp;");
-		Reg_name(rv, Bool_.N,  934, "&Phi;");
-		Reg_name(rv, Bool_.N,  966, "&phi;");
-		Reg_name(rv, Bool_.N,  928, "&Pi;");
-		Reg_name(rv, Bool_.N,  960, "&pi;");
-		Reg_name(rv, Bool_.N,  982, "&piv;");
-		Reg_name(rv, Bool_.N,  177, "&plusmn;");
-		Reg_name(rv, Bool_.N,  163, "&pound;");
-		Reg_name(rv, Bool_.N, 8242, "&prime;");
-		Reg_name(rv, Bool_.N, 8243, "&Prime;");
-		Reg_name(rv, Bool_.N, 8719, "&prod;");
-		Reg_name(rv, Bool_.N, 8733, "&prop;");
-		Reg_name(rv, Bool_.N,  936, "&Psi;");
-		Reg_name(rv, Bool_.N,  968, "&psi;");
-		Reg_name(rv, Bool_.N,   34, "&quot;");
-		Reg_name(rv, Bool_.N, 8730, "&radic;");
-		Reg_name(rv, Bool_.N, 9002, "&rang;");
-		Reg_name(rv, Bool_.N,  187, "&raquo;");
-		Reg_name(rv, Bool_.N, 8594, "&rarr;");
-		Reg_name(rv, Bool_.N, 8658, "&rArr;");
-		Reg_name(rv, Bool_.N, 8969, "&rceil;");
-		Reg_name(rv, Bool_.N, 8221, "&rdquo;");
-		Reg_name(rv, Bool_.N, 8476, "&real;");
-		Reg_name(rv, Bool_.N,  174, "&reg;");
-		Reg_name(rv, Bool_.N, 8971, "&rfloor;");
-		Reg_name(rv, Bool_.N,  929, "&Rho;");
-		Reg_name(rv, Bool_.N,  961, "&rho;");
-		Reg_name(rv, Bool_.N, 8207, "&rlm;");
-		Reg_name(rv, Bool_.N, 8250, "&rsaquo;");
-		Reg_name(rv, Bool_.N, 8217, "&rsquo;");
-		Reg_name(rv, Bool_.N, 8218, "&sbquo;");
-		Reg_name(rv, Bool_.N,  352, "&Scaron;");
-		Reg_name(rv, Bool_.N,  353, "&scaron;");
-		Reg_name(rv, Bool_.N, 8901, "&sdot;");
-		Reg_name(rv, Bool_.N,  167, "&sect;");
-		Reg_name(rv, Bool_.N,  173, "&shy;");
-		Reg_name(rv, Bool_.N,  931, "&Sigma;");
-		Reg_name(rv, Bool_.N,  963, "&sigma;");
-		Reg_name(rv, Bool_.N,  962, "&sigmaf;");
-		Reg_name(rv, Bool_.N, 8764, "&sim;");
-		Reg_name(rv, Bool_.N, 9824, "&spades;");
-		Reg_name(rv, Bool_.N, 8834, "&sub;");
-		Reg_name(rv, Bool_.N, 8838, "&sube;");
-		Reg_name(rv, Bool_.N, 8721, "&sum;");
-		Reg_name(rv, Bool_.N, 8835, "&sup;");
-		Reg_name(rv, Bool_.N,  185, "&sup1;");
-		Reg_name(rv, Bool_.N,  178, "&sup2;");
-		Reg_name(rv, Bool_.N,  179, "&sup3;");
-		Reg_name(rv, Bool_.N, 8839, "&supe;");
-		Reg_name(rv, Bool_.N,  223, "&szlig;");
-		Reg_name(rv, Bool_.N,  932, "&Tau;");
-		Reg_name(rv, Bool_.N,  964, "&tau;");
-		Reg_name(rv, Bool_.N, 8756, "&there4;");
-		Reg_name(rv, Bool_.N,  920, "&Theta;");
-		Reg_name(rv, Bool_.N,  952, "&theta;");
-		Reg_name(rv, Bool_.N,  977, "&thetasym;");
-		Reg_name(rv, Bool_.N, 8201, "&thinsp;");
-		Reg_name(rv, Bool_.N,  222, "&THORN;");
-		Reg_name(rv, Bool_.N,  254, "&thorn;");
-		Reg_name(rv, Bool_.N,  732, "&tilde;");
-		Reg_name(rv, Bool_.N,  215, "&times;");
-		Reg_name(rv, Bool_.N, 8482, "&trade;");
-		Reg_name(rv, Bool_.N,  218, "&Uacute;");
-		Reg_name(rv, Bool_.N,  250, "&uacute;");
-		Reg_name(rv, Bool_.N, 8593, "&uarr;");
-		Reg_name(rv, Bool_.N, 8657, "&uArr;");
-		Reg_name(rv, Bool_.N,  219, "&Ucirc;");
-		Reg_name(rv, Bool_.N,  251, "&ucirc;");
-		Reg_name(rv, Bool_.N,  217, "&Ugrave;");
-		Reg_name(rv, Bool_.N,  249, "&ugrave;");
-		Reg_name(rv, Bool_.N,  168, "&uml;");
-		Reg_name(rv, Bool_.N,  978, "&upsih;");
-		Reg_name(rv, Bool_.N,  933, "&Upsilon;");
-		Reg_name(rv, Bool_.N,  965, "&upsilon;");
-		Reg_name(rv, Bool_.N,  220, "&Uuml;");
-		Reg_name(rv, Bool_.N,  252, "&uuml;");
-		Reg_name(rv, Bool_.N, 8472, "&weierp;");
-		Reg_name(rv, Bool_.N,  926, "&Xi;");
-		Reg_name(rv, Bool_.N,  958, "&xi;");
-		Reg_name(rv, Bool_.N,  221, "&Yacute;");
-		Reg_name(rv, Bool_.N,  253, "&yacute;");
-		Reg_name(rv, Bool_.N,  165, "&yen;");
-		Reg_name(rv, Bool_.N,  376, "&Yuml;");
-		Reg_name(rv, Bool_.N,  255, "&yuml;");
-		Reg_name(rv, Bool_.N,  918, "&Zeta;");
-		Reg_name(rv, Bool_.N,  950, "&zeta;");
-		Reg_name(rv, Bool_.N, 8205, "&zwj;");
-		Reg_name(rv, Bool_.N, 8204, "&zwnj;");
-		Reg_prefix(rv, Xop_amp_trie_itm.Tid_num_hex, "#x");
-		Reg_prefix(rv, Xop_amp_trie_itm.Tid_num_hex, "#X");
-		Reg_prefix(rv, Xop_amp_trie_itm.Tid_num_dec, "#");
+		Add_name(rv, Bool_.Y,   60, Str__xowa_lt);
+		Add_name(rv, Bool_.Y,   91, Str__xowa_brack_bgn);
+		Add_name(rv, Bool_.Y,   93, Str__xowa_brack_end);
+		Add_name(rv, Bool_.Y,  124, Str__xowa_pipe);
+		Add_name(rv, Bool_.Y,   39, Str__xowa_apos);
+		Add_name(rv, Bool_.Y,   58, Str__xowa_colon);
+		Add_name(rv, Bool_.Y,   95, Str__xowa_underline);
+		Add_name(rv, Bool_.Y,   42, Str__xowa_asterisk);
+		Add_name(rv, Bool_.Y,   32, Str__xowa_space);
+		Add_name(rv, Bool_.Y,   10, Str__xowa_nl);
+		Add_name(rv, Bool_.Y,   45, Str__xowa_dash);
+		Add_name(rv, Bool_.N,   39, "&apos;");
+		Add_name(rv, Bool_.N,  193, "&Aacute;");
+		Add_name(rv, Bool_.N,  225, "&aacute;");
+		Add_name(rv, Bool_.N,  194, "&Acirc;");
+		Add_name(rv, Bool_.N,  226, "&acirc;");
+		Add_name(rv, Bool_.N,  180, "&acute;");
+		Add_name(rv, Bool_.N,  198, "&AElig;");
+		Add_name(rv, Bool_.N,  230, "&aelig;");
+		Add_name(rv, Bool_.N,  192, "&Agrave;");
+		Add_name(rv, Bool_.N,  224, "&agrave;");
+		Add_name(rv, Bool_.N, 8501, "&alefsym;");
+		Add_name(rv, Bool_.N,  913, "&Alpha;");
+		Add_name(rv, Bool_.N,  945, "&alpha;");
+		Add_name(rv, Bool_.N,   38, "&amp;");
+		Add_name(rv, Bool_.N, 8743, "&and;");
+		Add_name(rv, Bool_.N, 8736, "&ang;");
+		Add_name(rv, Bool_.N,  197, "&Aring;");
+		Add_name(rv, Bool_.N,  229, "&aring;");
+		Add_name(rv, Bool_.N, 8776, "&asymp;");
+		Add_name(rv, Bool_.N,  195, "&Atilde;");
+		Add_name(rv, Bool_.N,  227, "&atilde;");
+		Add_name(rv, Bool_.N,  196, "&Auml;");
+		Add_name(rv, Bool_.N,  228, "&auml;");
+		Add_name(rv, Bool_.N, 8222, "&bdquo;");
+		Add_name(rv, Bool_.N,  914, "&Beta;");
+		Add_name(rv, Bool_.N,  946, "&beta;");
+		Add_name(rv, Bool_.N,  166, "&brvbar;");
+		Add_name(rv, Bool_.N, 8226, "&bull;");
+		Add_name(rv, Bool_.N, 8745, "&cap;");
+		Add_name(rv, Bool_.N,  199, "&Ccedil;");
+		Add_name(rv, Bool_.N,  231, "&ccedil;");
+		Add_name(rv, Bool_.N,  184, "&cedil;");
+		Add_name(rv, Bool_.N,  162, "&cent;");
+		Add_name(rv, Bool_.N,  935, "&Chi;");
+		Add_name(rv, Bool_.N,  967, "&chi;");
+		Add_name(rv, Bool_.N,  710, "&circ;");
+		Add_name(rv, Bool_.N, 9827, "&clubs;");
+		Add_name(rv, Bool_.N, 8773, "&cong;");
+		Add_name(rv, Bool_.N,  169, "&copy;");
+		Add_name(rv, Bool_.N, 8629, "&crarr;");
+		Add_name(rv, Bool_.N, 8746, "&cup;");
+		Add_name(rv, Bool_.N,  164, "&curren;");
+		Add_name(rv, Bool_.N, 8224, "&dagger;");
+		Add_name(rv, Bool_.N, 8225, "&Dagger;");
+		Add_name(rv, Bool_.N, 8595, "&darr;");
+		Add_name(rv, Bool_.N, 8659, "&dArr;");
+		Add_name(rv, Bool_.N,  176, "&deg;");
+		Add_name(rv, Bool_.N,  916, "&Delta;");
+		Add_name(rv, Bool_.N,  948, "&delta;");
+		Add_name(rv, Bool_.N, 9830, "&diams;");
+		Add_name(rv, Bool_.N,  247, "&divide;");
+		Add_name(rv, Bool_.N,  201, "&Eacute;");
+		Add_name(rv, Bool_.N,  233, "&eacute;");
+		Add_name(rv, Bool_.N,  202, "&Ecirc;");
+		Add_name(rv, Bool_.N,  234, "&ecirc;");
+		Add_name(rv, Bool_.N,  200, "&Egrave;");
+		Add_name(rv, Bool_.N,  232, "&egrave;");
+		Add_name(rv, Bool_.N, 8709, "&empty;");
+		Add_name(rv, Bool_.N, 8195, "&emsp;");
+		Add_name(rv, Bool_.N, 8194, "&ensp;");
+		Add_name(rv, Bool_.N,  917, "&Epsilon;");
+		Add_name(rv, Bool_.N,  949, "&epsilon;");
+		Add_name(rv, Bool_.N, 8801, "&equiv;");
+		Add_name(rv, Bool_.N,  919, "&Eta;");
+		Add_name(rv, Bool_.N,  951, "&eta;");
+		Add_name(rv, Bool_.N,  208, "&ETH;");
+		Add_name(rv, Bool_.N,  240, "&eth;");
+		Add_name(rv, Bool_.N,  203, "&Euml;");
+		Add_name(rv, Bool_.N,  235, "&euml;");
+		Add_name(rv, Bool_.N, 8364, "&euro;");
+		Add_name(rv, Bool_.N, 8707, "&exist;");
+		Add_name(rv, Bool_.N,  402, "&fnof;");
+		Add_name(rv, Bool_.N, 8704, "&forall;");
+		Add_name(rv, Bool_.N,  189, "&frac12;");
+		Add_name(rv, Bool_.N,  188, "&frac14;");
+		Add_name(rv, Bool_.N,  190, "&frac34;");
+		Add_name(rv, Bool_.N, 8260, "&frasl;");
+		Add_name(rv, Bool_.N,  915, "&Gamma;");
+		Add_name(rv, Bool_.N,  947, "&gamma;");
+		Add_name(rv, Bool_.N, 8805, "&ge;");
+		Add_name(rv, Bool_.N,   62, "&gt;");
+		Add_name(rv, Bool_.N, 8596, "&harr;");
+		Add_name(rv, Bool_.N, 8660, "&hArr;");
+		Add_name(rv, Bool_.N, 9829, "&hearts;");
+		Add_name(rv, Bool_.N, 8230, "&hellip;");
+		Add_name(rv, Bool_.N,  205, "&Iacute;");
+		Add_name(rv, Bool_.N,  237, "&iacute;");
+		Add_name(rv, Bool_.N,  206, "&Icirc;");
+		Add_name(rv, Bool_.N,  238, "&icirc;");
+		Add_name(rv, Bool_.N,  161, "&iexcl;");
+		Add_name(rv, Bool_.N,  204, "&Igrave;");
+		Add_name(rv, Bool_.N,  236, "&igrave;");
+		Add_name(rv, Bool_.N, 8465, "&image;");
+		Add_name(rv, Bool_.N, 8734, "&infin;");
+		Add_name(rv, Bool_.N, 8747, "&int;");
+		Add_name(rv, Bool_.N,  921, "&Iota;");
+		Add_name(rv, Bool_.N,  953, "&iota;");
+		Add_name(rv, Bool_.N,  191, "&iquest;");
+		Add_name(rv, Bool_.N, 8712, "&isin;");
+		Add_name(rv, Bool_.N,  207, "&Iuml;");
+		Add_name(rv, Bool_.N,  239, "&iuml;");
+		Add_name(rv, Bool_.N,  922, "&Kappa;");
+		Add_name(rv, Bool_.N,  954, "&kappa;");
+		Add_name(rv, Bool_.N,  923, "&Lambda;");
+		Add_name(rv, Bool_.N,  955, "&lambda;");
+		Add_name(rv, Bool_.N, 9001, "&lang;");
+		Add_name(rv, Bool_.N,  171, "&laquo;");
+		Add_name(rv, Bool_.N, 8592, "&larr;");
+		Add_name(rv, Bool_.N, 8656, "&lArr;");
+		Add_name(rv, Bool_.N, 8968, "&lceil;");
+		Add_name(rv, Bool_.N, 8220, "&ldquo;");
+		Add_name(rv, Bool_.N, 8804, "&le;");
+		Add_name(rv, Bool_.N, 8970, "&lfloor;");
+		Add_name(rv, Bool_.N, 8727, "&lowast;");
+		Add_name(rv, Bool_.N, 9674, "&loz;");
+		Add_name(rv, Bool_.N, 8206, "&lrm;");
+		Add_name(rv, Bool_.N, 8249, "&lsaquo;");
+		Add_name(rv, Bool_.N, 8216, "&lsquo;");
+		Add_name(rv, Bool_.N,   60, "&lt;");
+		Add_name(rv, Bool_.N,  175, "&macr;");
+		Add_name(rv, Bool_.N, 8212, "&mdash;");
+		Add_name(rv, Bool_.N,  181, "&micro;");
+		Add_name(rv, Bool_.N,  183, "&middot;");
+		Add_name(rv, Bool_.N, 8722, "&minus;");
+		Add_name(rv, Bool_.N,  924, "&Mu;");
+		Add_name(rv, Bool_.N,  956, "&mu;");
+		Add_name(rv, Bool_.N, 8711, "&nabla;");
+		Add_name(rv, Bool_.N,  160, "&nbsp;");
+		Add_name(rv, Bool_.N, 8211, "&ndash;");
+		Add_name(rv, Bool_.N, 8800, "&ne;");
+		Add_name(rv, Bool_.N, 8715, "&ni;");
+		Add_name(rv, Bool_.N,  172, "&not;");
+		Add_name(rv, Bool_.N, 8713, "&notin;");
+		Add_name(rv, Bool_.N, 8836, "&nsub;");
+		Add_name(rv, Bool_.N,  209, "&Ntilde;");
+		Add_name(rv, Bool_.N,  241, "&ntilde;");
+		Add_name(rv, Bool_.N,  925, "&Nu;");
+		Add_name(rv, Bool_.N,  957, "&nu;");
+		Add_name(rv, Bool_.N,  211, "&Oacute;");
+		Add_name(rv, Bool_.N,  243, "&oacute;");
+		Add_name(rv, Bool_.N,  212, "&Ocirc;");
+		Add_name(rv, Bool_.N,  244, "&ocirc;");
+		Add_name(rv, Bool_.N,  338, "&OElig;");
+		Add_name(rv, Bool_.N,  339, "&oelig;");
+		Add_name(rv, Bool_.N,  210, "&Ograve;");
+		Add_name(rv, Bool_.N,  242, "&ograve;");
+		Add_name(rv, Bool_.N, 8254, "&oline;");
+		Add_name(rv, Bool_.N,  937, "&Omega;");
+		Add_name(rv, Bool_.N,  969, "&omega;");
+		Add_name(rv, Bool_.N,  927, "&Omicron;");
+		Add_name(rv, Bool_.N,  959, "&omicron;");
+		Add_name(rv, Bool_.N, 8853, "&oplus;");
+		Add_name(rv, Bool_.N, 8744, "&or;");
+		Add_name(rv, Bool_.N,  170, "&ordf;");
+		Add_name(rv, Bool_.N,  186, "&ordm;");
+		Add_name(rv, Bool_.N,  216, "&Oslash;");
+		Add_name(rv, Bool_.N,  248, "&oslash;");
+		Add_name(rv, Bool_.N,  213, "&Otilde;");
+		Add_name(rv, Bool_.N,  245, "&otilde;");
+		Add_name(rv, Bool_.N, 8855, "&otimes;");
+		Add_name(rv, Bool_.N,  214, "&Ouml;");
+		Add_name(rv, Bool_.N,  246, "&ouml;");
+		Add_name(rv, Bool_.N,  182, "&para;");
+		Add_name(rv, Bool_.N, 8706, "&part;");
+		Add_name(rv, Bool_.N, 8240, "&permil;");
+		Add_name(rv, Bool_.N, 8869, "&perp;");
+		Add_name(rv, Bool_.N,  934, "&Phi;");
+		Add_name(rv, Bool_.N,  966, "&phi;");
+		Add_name(rv, Bool_.N,  928, "&Pi;");
+		Add_name(rv, Bool_.N,  960, "&pi;");
+		Add_name(rv, Bool_.N,  982, "&piv;");
+		Add_name(rv, Bool_.N,  177, "&plusmn;");
+		Add_name(rv, Bool_.N,  163, "&pound;");
+		Add_name(rv, Bool_.N, 8242, "&prime;");
+		Add_name(rv, Bool_.N, 8243, "&Prime;");
+		Add_name(rv, Bool_.N, 8719, "&prod;");
+		Add_name(rv, Bool_.N, 8733, "&prop;");
+		Add_name(rv, Bool_.N,  936, "&Psi;");
+		Add_name(rv, Bool_.N,  968, "&psi;");
+		Add_name(rv, Bool_.N,   34, "&quot;");
+		Add_name(rv, Bool_.N, 8730, "&radic;");
+		Add_name(rv, Bool_.N, 9002, "&rang;");
+		Add_name(rv, Bool_.N,  187, "&raquo;");
+		Add_name(rv, Bool_.N, 8594, "&rarr;");
+		Add_name(rv, Bool_.N, 8658, "&rArr;");
+		Add_name(rv, Bool_.N, 8969, "&rceil;");
+		Add_name(rv, Bool_.N, 8221, "&rdquo;");
+		Add_name(rv, Bool_.N, 8476, "&real;");
+		Add_name(rv, Bool_.N,  174, "&reg;");
+		Add_name(rv, Bool_.N, 8971, "&rfloor;");
+		Add_name(rv, Bool_.N,  929, "&Rho;");
+		Add_name(rv, Bool_.N,  961, "&rho;");
+		Add_name(rv, Bool_.N, 8207, "&rlm;");
+		Add_name(rv, Bool_.N, 8250, "&rsaquo;");
+		Add_name(rv, Bool_.N, 8217, "&rsquo;");
+		Add_name(rv, Bool_.N, 8218, "&sbquo;");
+		Add_name(rv, Bool_.N,  352, "&Scaron;");
+		Add_name(rv, Bool_.N,  353, "&scaron;");
+		Add_name(rv, Bool_.N, 8901, "&sdot;");
+		Add_name(rv, Bool_.N,  167, "&sect;");
+		Add_name(rv, Bool_.N,  173, "&shy;");
+		Add_name(rv, Bool_.N,  931, "&Sigma;");
+		Add_name(rv, Bool_.N,  963, "&sigma;");
+		Add_name(rv, Bool_.N,  962, "&sigmaf;");
+		Add_name(rv, Bool_.N, 8764, "&sim;");
+		Add_name(rv, Bool_.N, 9824, "&spades;");
+		Add_name(rv, Bool_.N, 8834, "&sub;");
+		Add_name(rv, Bool_.N, 8838, "&sube;");
+		Add_name(rv, Bool_.N, 8721, "&sum;");
+		Add_name(rv, Bool_.N, 8835, "&sup;");
+		Add_name(rv, Bool_.N,  185, "&sup1;");
+		Add_name(rv, Bool_.N,  178, "&sup2;");
+		Add_name(rv, Bool_.N,  179, "&sup3;");
+		Add_name(rv, Bool_.N, 8839, "&supe;");
+		Add_name(rv, Bool_.N,  223, "&szlig;");
+		Add_name(rv, Bool_.N,  932, "&Tau;");
+		Add_name(rv, Bool_.N,  964, "&tau;");
+		Add_name(rv, Bool_.N, 8756, "&there4;");
+		Add_name(rv, Bool_.N,  920, "&Theta;");
+		Add_name(rv, Bool_.N,  952, "&theta;");
+		Add_name(rv, Bool_.N,  977, "&thetasym;");
+		Add_name(rv, Bool_.N, 8201, "&thinsp;");
+		Add_name(rv, Bool_.N,  222, "&THORN;");
+		Add_name(rv, Bool_.N,  254, "&thorn;");
+		Add_name(rv, Bool_.N,  732, "&tilde;");
+		Add_name(rv, Bool_.N,  215, "&times;");
+		Add_name(rv, Bool_.N, 8482, "&trade;");
+		Add_name(rv, Bool_.N,  218, "&Uacute;");
+		Add_name(rv, Bool_.N,  250, "&uacute;");
+		Add_name(rv, Bool_.N, 8593, "&uarr;");
+		Add_name(rv, Bool_.N, 8657, "&uArr;");
+		Add_name(rv, Bool_.N,  219, "&Ucirc;");
+		Add_name(rv, Bool_.N,  251, "&ucirc;");
+		Add_name(rv, Bool_.N,  217, "&Ugrave;");
+		Add_name(rv, Bool_.N,  249, "&ugrave;");
+		Add_name(rv, Bool_.N,  168, "&uml;");
+		Add_name(rv, Bool_.N,  978, "&upsih;");
+		Add_name(rv, Bool_.N,  933, "&Upsilon;");
+		Add_name(rv, Bool_.N,  965, "&upsilon;");
+		Add_name(rv, Bool_.N,  220, "&Uuml;");
+		Add_name(rv, Bool_.N,  252, "&uuml;");
+		Add_name(rv, Bool_.N, 8472, "&weierp;");
+		Add_name(rv, Bool_.N,  926, "&Xi;");
+		Add_name(rv, Bool_.N,  958, "&xi;");
+		Add_name(rv, Bool_.N,  221, "&Yacute;");
+		Add_name(rv, Bool_.N,  253, "&yacute;");
+		Add_name(rv, Bool_.N,  165, "&yen;");
+		Add_name(rv, Bool_.N,  376, "&Yuml;");
+		Add_name(rv, Bool_.N,  255, "&yuml;");
+		Add_name(rv, Bool_.N,  918, "&Zeta;");
+		Add_name(rv, Bool_.N,  950, "&zeta;");
+		Add_name(rv, Bool_.N, 8205, "&zwj;");
+		Add_name(rv, Bool_.N, 8204, "&zwnj;");
+		Add_prefix(rv, Xop_amp_trie_itm.Tid_num_hex, "#x");
+		Add_prefix(rv, Xop_amp_trie_itm.Tid_num_hex, "#X");
+		Add_prefix(rv, Xop_amp_trie_itm.Tid_num_dec, "#");
 		return rv;
 	}
-	private static void Reg_name(Btrie_slim_mgr trie, boolean tid_is_xowa, int char_int, String xml_name_str) {Reg_name(trie, tid_is_xowa, char_int, Bry_.new_a7(xml_name_str));}
-	private static void Reg_name(Btrie_slim_mgr trie, boolean tid_is_xowa, int char_int, byte[] xml_name_bry) {
+	private static void Add_name(Btrie_slim_mgr trie, boolean tid_is_xowa, int char_int, String xml_name_str) {
 		byte itm_tid = tid_is_xowa ? Xop_amp_trie_itm.Tid_name_xowa : Xop_amp_trie_itm.Tid_name_std;
-		Xop_amp_trie_itm itm = new Xop_amp_trie_itm(itm_tid, char_int, xml_name_bry);
+		byte[] xml_name_bry = Bry_.new_a7(xml_name_str);
 		byte[] key = Bry_.Mid(xml_name_bry, 1, xml_name_bry.length); // ignore & for purpose of trie; EX: "amp;"; NOTE: must keep trailing ";" else "&amp " will be valid;
-		trie.Add_obj(key, itm);
+		trie.Add_obj(key, new Xop_amp_trie_itm(itm_tid, char_int, xml_name_bry));
 	}
-	private static void Reg_prefix(Btrie_slim_mgr trie, byte prefix_type, String prefix) {
-		byte[] prefix_ary = Bry_.new_a7(prefix);
+	private static void Add_prefix(Btrie_slim_mgr trie, byte prefix_type, String prefix) {
+		byte[] prefix_ary = Bry_.new_u8(prefix);
 		Xop_amp_trie_itm itm = new Xop_amp_trie_itm(prefix_type, Xop_amp_trie_itm.Char_int_null, prefix_ary);
 		trie.Add_obj(prefix_ary, itm);
 	}
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_trie_itm.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_trie_itm.java
index 125aa17dd..2ee34eb69 100644
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_trie_itm.java
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_trie_itm.java
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
 import gplx.langs.htmls.*; import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*;
-public class Xop_amp_trie_itm {
+public class Xop_amp_trie_itm {	// TS
 	public Xop_amp_trie_itm(byte tid, int char_int, byte[] xml_name_bry) {
 		this.tid = tid;
 		this.char_int = char_int;
@@ -25,11 +25,12 @@ public class Xop_amp_trie_itm {
 		this.xml_name_bry = xml_name_bry; 
 		this.key_name_len = xml_name_bry.length - 2;	// 2 for & and ;
 	}
-	public byte		Tid()			{return tid;}			private final byte tid;
-	public int		Char_int()		{return char_int;}		private final int char_int;			// val; EX: 160
-	public byte[]	U8_bry()		{return u8_bry;}		private final byte[] u8_bry;			// EX: new byte[] {192, 160}; (C2, A0)
-	public byte[]	Xml_name_bry()	{return xml_name_bry;}	private final byte[] xml_name_bry;	// EX: "&nbsp;"
-	public int		Key_name_len()	{return key_name_len;}	private final int key_name_len;		// EX: "nbsp".Len
+	public byte		Tid()			{return tid;}			private final    byte tid;
+	public int		Char_int()		{return char_int;}		private final    int char_int;			// val; EX: 160
+	public byte[]	U8_bry()		{return u8_bry;}		private final    byte[] u8_bry;			// EX: new byte[] {192, 160}; (C2, A0)
+	public byte[]	Xml_name_bry()	{return xml_name_bry;}	private final    byte[] xml_name_bry;	// EX: "&nbsp;"
+	public int		Key_name_len()	{return key_name_len;}	private final    int key_name_len;		// EX: "nbsp".Len
+
 	public void Print_ncr(Bry_bfr bfr) {
 		switch (char_int) {
 			case Byte_ascii.Lt: case Byte_ascii.Gt: case Byte_ascii.Quote: case Byte_ascii.Amp:
@@ -48,9 +49,7 @@ public class Xop_amp_trie_itm {
 			case Byte_ascii.Gt:			bfr.Add(Gfh_entity_.Gt_bry); break;
 			case Byte_ascii.Quote:		bfr.Add(Gfh_entity_.Quote_bry); break;
 			case Byte_ascii.Amp:		bfr.Add(Gfh_entity_.Amp_bry); break;
-			default:
-				bfr.Add(u8_bry);		// write literal; EX: "[" not "&#91;"
-				break;
+			default:					bfr.Add(u8_bry); break;				// write literal; EX: "[" not "&#91;"
 		}			
 	}
 	public static final byte Tid_name_std = 1, Tid_name_xowa = 2, Tid_num_hex = 3, Tid_num_dec = 4;
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_wkr.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_wkr.java
index 6cc79690a..effe63d13 100644
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_wkr.java
@@ -20,11 +20,13 @@ public class Xop_amp_wkr implements Xop_ctx_wkr {
 	public void Ctor_ctx(Xop_ctx ctx) {}
 	public void Page_bgn(Xop_ctx ctx, Xop_root_tkn root) {}
 	public void Page_end(Xop_ctx ctx, Xop_root_tkn root, byte[] src, int src_len) {}
-	public int Make_tkn(Xop_ctx ctx, Xop_tkn_mkr tkn_mkr, Xop_root_tkn root, byte[] src, int src_len, int bgn, int cur_pos) {
-		if (cur_pos == src_len) return ctx.Lxr_make_txt_(cur_pos);	// NOTE: & is last char in page; strange and rare, but don't raise error
+	public int Make_tkn(Xop_ctx ctx, Xop_tkn_mkr tkn_mkr, Xop_root_tkn root, byte[] src, int src_len, int bgn, int cur) {
+		if (cur == src_len) return ctx.Lxr_make_txt_(cur);	// NOTE: & is last char in page; strange and rare, but don't raise error
+
 		Xop_amp_mgr amp_mgr = ctx.App().Parser_amp_mgr();
-		Xop_tkn_itm amp_tkn = amp_mgr.Parse_as_tkn(tkn_mkr, src, src_len, bgn, cur_pos);
-		int rv_pos = amp_mgr.Rslt_pos();
+		Xop_amp_mgr_rslt amp_rv = amp_mgr.Parse_tkn(tkn_mkr, src, src_len, bgn, cur);
+		Xop_tkn_itm amp_tkn = amp_rv.Tkn();
+		int rv_pos = amp_rv.Pos();
 		if (amp_tkn == null) return ctx.Lxr_make_txt_(rv_pos);
 		ctx.Subs_add(root, amp_tkn);
 		return rv_pos;
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_wkr_tst.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_wkr_tst.java
index 07c886e8d..567d2777c 100644
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_wkr_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_amp_wkr_tst.java
@@ -18,11 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
 import org.junit.*;
 public class Xop_amp_wkr_tst {
-	private final Xop_fxt fxt = new Xop_fxt();
-	@Test  public void Name()					{fxt.Test_parse_page_wiki("&amp;"			, fxt.tkn_html_ref_("&amp;"));}			// check for html_ref 
-	@Test  public void Name_fail()				{fxt.Test_parse_page_wiki("&nil;"			, fxt.tkn_txt_(0, 5));}					// check for text
-	@Test  public void Hex()					{fxt.Test_parse_page_wiki("&#x3A3;"			, fxt.tkn_html_ncr_(931));}				// check for html_ncr; Σ: http://en.wikipedia.org/wiki/Numeric_character_reference
-	@Test  public void Num_fail_incomplete()	{fxt.Test_parse_page_wiki("&#"				, fxt.tkn_txt_());}
+	private final    Xop_fxt fxt = new Xop_fxt();
 	@Test  public void Convert_to_named()		{fxt.Test_parse_page_wiki_str("&amp;"		, "&amp;");}	// note that &amp; is printed, not &
 	@Test  public void Convert_to_named_amp()	{fxt.Test_parse_page_wiki_str("&"			, "&amp;");}	// PURPOSE: html_wtr was not handling & only
 	@Test  public void Convert_to_numeric()		{fxt.Test_parse_page_wiki_str("&aacute;"	, "&#225;");}	// testing that &#225; is outputted, not á
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_num_tkn_chkr.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_num_tkn_chkr.java
deleted file mode 100644
index fac701e13..000000000
--- a/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_num_tkn_chkr.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
-import gplx.core.tests.*;
-public class Xop_html_num_tkn_chkr extends Xop_tkn_chkr_base {
-	@Override public Class<?> TypeOf() {return Xop_amp_tkn_num.class;}
-	@Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_html_ncr;}
-	public int Html_ncr_val() {return html_ncr_val;} public Xop_html_num_tkn_chkr Html_ncr_val_(int v) {html_ncr_val = v; return this;} private int html_ncr_val = -1;
-	@Override public int Chk_hook(Tst_mgr mgr, String path, Object actl_obj, int err) {
-		Xop_amp_tkn_num actl = (Xop_amp_tkn_num)actl_obj;
-		err += mgr.Tst_val(html_ncr_val == -1, path, "html_ncr_val", html_ncr_val, actl.Val());
-		return err;
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_dat.java b/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_dat.java
index 5a9774805..21af6165b 100644
--- a/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_dat.java
+++ b/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_dat.java
@@ -33,8 +33,6 @@ public class Xop_apos_dat {
 			default:
 				lit_apos = apos_len - Xop_apos_tkn_.Len_dual;
 				Ident_props(Xop_apos_tkn_.Len_dual);
-				if (lit_apos > 1)
-					ctx.Msg_log().Add_itm_none(Xop_apos_log.Multiple_apos, src, cur_pos - apos_len, cur_pos);
 				break;
 		}
 	}
diff --git a/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_itm.java b/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_itm.java
new file mode 100644
index 000000000..905822b34
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_itm.java
@@ -0,0 +1,84 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.parsers.apos; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+public class Xop_apos_itm {
+	public int State() {return state;} public void State_clear() {state = Xop_apos_tkn_.State_nil;} private int state = Xop_apos_tkn_.State_nil;
+	public int Typ() {return typ;} private int typ;
+	public int Cmd() {return cmd;} private int cmd;
+	public int Lit_apos() {return lit_apos;} private int lit_apos;
+	public int Dual_cmd() {return dual_cmd;} private int dual_cmd;
+	public void Init(int state, int typ, int cmd, int lit_apos, int dual_cmd) {
+		this.state = state;
+		this.typ = typ; this.cmd = cmd; this.lit_apos = lit_apos; this.dual_cmd = dual_cmd;
+	}
+	public static void Ident(Xop_apos_itm rv, Xop_ctx ctx, byte[] src, int apos_len, int cur_pos, int state) {
+		switch (apos_len) {
+			case Xop_apos_tkn_.Len_ital: case Xop_apos_tkn_.Len_bold: case Xop_apos_tkn_.Len_dual:
+				Ident_props(rv, state, apos_len, 0); break;
+			case Xop_apos_tkn_.Len_apos_bold:
+				Ident_props(rv, state, Xop_apos_tkn_.Len_bold, 1); break;
+			default:
+				Ident_props(rv, state, Xop_apos_tkn_.Len_dual, apos_len - Xop_apos_tkn_.Len_dual);
+				break;
+		}
+	}
+	private static void Ident_props(Xop_apos_itm rv, int state, int apos_len, int lit_apos) {
+		int typ = apos_len;
+		int cmd = 0, dual_cmd = 0;
+		switch (apos_len) {
+			case Xop_apos_tkn_.Len_ital: {
+				switch (state) {
+					case Xop_apos_tkn_.State_i:		cmd = Xop_apos_tkn_.Cmd_i_end;			state = Xop_apos_tkn_.State_nil;	break;
+					case Xop_apos_tkn_.State_bi:	cmd = Xop_apos_tkn_.Cmd_i_end;			state = Xop_apos_tkn_.State_b;		break;
+					case Xop_apos_tkn_.State_ib:	cmd = Xop_apos_tkn_.Cmd_bi_end__b_bgn;	state = Xop_apos_tkn_.State_b;		break;
+					case Xop_apos_tkn_.State_dual:	cmd = Xop_apos_tkn_.Cmd_i_end;			state = Xop_apos_tkn_.State_b;		dual_cmd = Xop_apos_tkn_.Cmd_bi_bgn; break;
+					case Xop_apos_tkn_.State_b:		cmd = Xop_apos_tkn_.Cmd_i_bgn;			state = Xop_apos_tkn_.State_bi;		break;
+					case Xop_apos_tkn_.State_nil:	cmd = Xop_apos_tkn_.Cmd_i_bgn;			state = Xop_apos_tkn_.State_i;		break;
+					default:						throw Err_.new_unhandled(state);
+				}
+				break;
+			}
+			case Xop_apos_tkn_.Len_bold:	{
+				switch (state) {
+					case Xop_apos_tkn_.State_b:		cmd = Xop_apos_tkn_.Cmd_b_end;			state = Xop_apos_tkn_.State_nil;	break;
+					case Xop_apos_tkn_.State_bi:	cmd = Xop_apos_tkn_.Cmd_ib_end__i_bgn;	state = Xop_apos_tkn_.State_i;		break;
+					case Xop_apos_tkn_.State_ib:	cmd = Xop_apos_tkn_.Cmd_b_end;			state = Xop_apos_tkn_.State_i;		break;
+					case Xop_apos_tkn_.State_dual:	cmd = Xop_apos_tkn_.Cmd_b_end;			state = Xop_apos_tkn_.State_i;		break; // NOTE: dual_cmd = Cmd_ib_bgn is implied
+					case Xop_apos_tkn_.State_i:		cmd = Xop_apos_tkn_.Cmd_b_bgn;			state = Xop_apos_tkn_.State_ib;		break;
+					case Xop_apos_tkn_.State_nil:	cmd = Xop_apos_tkn_.Cmd_b_bgn;			state = Xop_apos_tkn_.State_b;		break;
+					default:						throw Err_.new_unhandled(state);
+				}
+				break;
+			}
+			case Xop_apos_tkn_.Len_dual:	{
+				switch (state) {
+					case Xop_apos_tkn_.State_b:		cmd = Xop_apos_tkn_.Cmd_b_end__i_bgn;	state = Xop_apos_tkn_.State_i;		break;
+					case Xop_apos_tkn_.State_i:		cmd = Xop_apos_tkn_.Cmd_i_end__b_bgn;	state = Xop_apos_tkn_.State_b;		break;
+					case Xop_apos_tkn_.State_bi:	cmd = Xop_apos_tkn_.Cmd_ib_end;			state = Xop_apos_tkn_.State_nil;	break;
+					case Xop_apos_tkn_.State_ib:	cmd = Xop_apos_tkn_.Cmd_bi_end;			state = Xop_apos_tkn_.State_nil;	break;
+					case Xop_apos_tkn_.State_dual:	cmd = Xop_apos_tkn_.Cmd_bi_end;			state = Xop_apos_tkn_.State_nil;	break; // NOTE: dual_cmd = Cmd_ib_bgn is implied
+					case Xop_apos_tkn_.State_nil:	cmd = Xop_apos_tkn_.Cmd_ib_bgn;			state = Xop_apos_tkn_.State_dual;	break;
+					default:						throw Err_.new_unhandled(state);
+				}
+				break;
+			}
+			default: throw Err_.new_unhandled_default(apos_len);
+		}
+		rv.Init(state, typ, cmd, lit_apos, dual_cmd);
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_wkr.java b/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_wkr.java
index 86aeba17d..b1b7ea9e1 100644
--- a/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/apos/Xop_apos_wkr.java
@@ -17,27 +17,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.parsers.apos; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
 public class Xop_apos_wkr implements Xop_ctx_wkr {
-	public Xop_apos_dat Dat() {return dat;} private Xop_apos_dat dat = new Xop_apos_dat();
-	private List_adp stack = List_adp_.New(); private int bold_count, ital_count; private Xop_apos_tkn dual_tkn = null;
+	private final    List_adp stack = List_adp_.New();
+	private int bold_count, ital_count; private Xop_apos_tkn dual_tkn = null;
+	private Xop_apos_dat dat = new Xop_apos_dat();
 	public void Ctor_ctx(Xop_ctx ctx) {}
-	public void Page_bgn(Xop_ctx ctx, Xop_root_tkn root) {
-		Reset();
-	}
+	public void Page_bgn(Xop_ctx ctx, Xop_root_tkn root) {Clear();}
 	public void Page_end(Xop_ctx ctx, Xop_root_tkn root, byte[] src, int src_len) {
-		this.EndFrame(ctx, root, src, src_len, false);
+		this.End_frame(ctx, root, src, src_len, false);
 	}
 	public void AutoClose(Xop_ctx ctx, byte[] src, int src_len, int bgn_pos, int cur_pos, Xop_tkn_itm tkn) {}
-	public int Stack_len() {return stack.Count();}
+	public int Stack_len() {return stack.Len();}
+	private void Clear() {
+		bold_count = ital_count = 0;
+		dual_tkn = null;
+		stack.Clear();
+		dat.State_clear();
+	}
 	public int Make_tkn(Xop_ctx ctx, Xop_tkn_mkr tkn_mkr, Xop_root_tkn root, byte[] src, int src_len, int bgn_pos, int cur_pos) {
 		cur_pos = Bry_find_.Find_fwd_while(src, cur_pos, src_len, Byte_ascii.Apos);
 		int apos_len = cur_pos - bgn_pos;
 		dat.Ident(ctx, src, apos_len, cur_pos);
 		Xop_apos_tkn apos_tkn = tkn_mkr.Apos(bgn_pos, cur_pos, apos_len, dat.Typ(), dat.Cmd(), dat.Lit_apos());
 		ctx.Subs_add(root, apos_tkn);
-		ctx.Apos().RegTkn(apos_tkn, cur_pos);
+		ctx.Apos().Reg_tkn(apos_tkn, cur_pos);	// NOTE: register in root ctx (main document)
 		return cur_pos;
 	}
-	public void RegTkn(Xop_apos_tkn tkn, int cur_pos) { // REF.MW: Parser|doQuotes
+	private void Reg_tkn(Xop_apos_tkn tkn, int cur_pos) { // REF.MW: Parser|doQuotes
 		stack.Add(tkn);			
 		switch (tkn.Apos_tid()) {
 			case Xop_apos_tkn_.Len_ital: ital_count++; break; 
@@ -52,19 +57,18 @@ public class Xop_apos_wkr implements Xop_ctx_wkr {
 			dual_tkn = null;
 		}
 	}
-	public void EndFrame(Xop_ctx ctx, Xop_root_tkn root, byte[] src, int cur_pos, boolean skip_cancel_if_lnki_and_apos) {
+	public void End_frame(Xop_ctx ctx, Xop_root_tkn root, byte[] src, int cur_pos, boolean skip_cancel_if_lnki_and_apos) {
 		int state = dat.State();
-		if (state == 0) {Reset(); return;}
-		if (bold_count % 2 == 1 && ital_count % 2 == 1) ConvertBoldToItal(ctx, src);
+		if (state == 0) {Clear(); return;}	// all apos close correctly; nothing dangling; return;
 
+		if (bold_count % 2 == 1 && ital_count % 2 == 1) Convert_bold_to_ital(ctx, src, stack, dat);
 		state = dat.State();
+		if (state == 0) {Clear(); return;}	// all apos close correctly after converting bold to italic; return;
+
 		int closeCmd = 0, closeTyp = 0;
-		if (state == 0) {Reset(); return;}	// all closed: return
 		byte cur_tkn_tid = ctx.Cur_tkn_tid();
-		Xop_apos_tkn prv = Previous_bgn(stack, closeTyp);
 		if (	skip_cancel_if_lnki_and_apos						// NOTE: if \n or tblw
 			&&	cur_tkn_tid	== Xop_tkn_itm_.Tid_lnki				// and cur scope is lnki
-//				&&	prv.Ctx_tkn_tid() != Xop_tkn_itm_.Tid_lnki			// but apos_bgn is not lnki; NOTE: disabled on 2013-11-10
 			)
 			return;													// don't end frame
 		switch (state) {
@@ -74,30 +78,29 @@ public class Xop_apos_wkr implements Xop_ctx_wkr {
 			case Xop_apos_tkn_.State_ib:	closeTyp = Xop_apos_tkn_.Typ_dual; closeCmd = Xop_apos_tkn_.Cmd_bi_end; break;
 			case Xop_apos_tkn_.State_bi:	closeTyp = Xop_apos_tkn_.Typ_dual; closeCmd = Xop_apos_tkn_.Cmd_ib_end; break;
 		}
-		ctx.Msg_log().Add_itm_none(Xop_apos_log.Dangling_apos, src, prv.Src_bgn(), cur_pos);
 		ctx.Subs_add(root, ctx.Tkn_mkr().Apos(cur_pos, cur_pos, 0, closeTyp, closeCmd, 0));
-		Reset();
+		Clear();
 	}
-	private void ConvertBoldToItal(Xop_ctx ctx, byte[] src) {
+	private static void Convert_bold_to_ital(Xop_ctx ctx, byte[] src, List_adp stack, Xop_apos_dat dat) {
 		Xop_apos_tkn idxNeg1 = null, idxNeg2 = null, idxNone = null; // look at previous tkn for spaces; EX: "a '''" -> idxNeg1; " a'''" -> idxNeg2; "ab'''" -> idxNone
-	    int tknsLen = stack.Count(); 
-		for (int i = 0; i < tknsLen; i++) {
+	    int len = stack.Len(); 
+		for (int i = 0; i < len; ++i) {
 			Xop_apos_tkn apos = (Xop_apos_tkn)stack.Get_at(i);
 			if (apos.Apos_tid() != Xop_apos_tkn_.Typ_bold) continue;	// only look for bold
-			int tknBgn = apos.Src_bgn();
-			boolean idxNeg1Space = tknBgn > 0 && src[tknBgn - 1] == Byte_ascii.Space;
-			boolean idxNeg2Space = tknBgn > 1 && src[tknBgn - 2] == Byte_ascii.Space;
+			int tkn_bgn = apos.Src_bgn();
+			boolean idxNeg1Space = tkn_bgn > 0 && src[tkn_bgn - 1] == Byte_ascii.Space;
+			boolean idxNeg2Space = tkn_bgn > 1 && src[tkn_bgn - 2] == Byte_ascii.Space;
 			if		(idxNeg1 == null && idxNeg1Space)					{idxNeg1 = apos;}
 			else if (idxNeg2 == null && idxNeg2Space)					{idxNeg2 = apos;}
 			else if (idxNone == null && !idxNeg1Space && !idxNeg2Space)	{idxNone = apos;}
 		}
-		if		(idxNeg2 != null) ConvertBoldToItal(ctx, src, idxNeg2); // 1st single letter word
-		else if (idxNone != null) ConvertBoldToItal(ctx, src, idxNone); // 1st multi letter word
-		else if	(idxNeg1 != null) ConvertBoldToItal(ctx, src, idxNeg1); // everything else
+		if		(idxNeg2 != null) Convert_bold_to_ital(ctx, src, idxNeg2); // 1st single letter word
+		else if (idxNone != null) Convert_bold_to_ital(ctx, src, idxNone); // 1st multi letter word
+		else if	(idxNeg1 != null) Convert_bold_to_ital(ctx, src, idxNeg1); // everything else
 
 		// now recalc all cmds for stack
 		dat.State_clear();
-		for (int i = 0; i < tknsLen; i++) {
+		for (int i = 0; i < len; i++) {
 			Xop_apos_tkn apos = (Xop_apos_tkn)stack.Get_at(i);
 			dat.Ident(ctx, src, apos.Apos_tid(), apos.Src_end());	// NOTE: apos.Typ() must map to apos_len
 			int newCmd = dat.Cmd();
@@ -105,57 +108,7 @@ public class Xop_apos_wkr implements Xop_ctx_wkr {
 			apos.Apos_cmd_(newCmd);
 		}
 	}
-	private void ConvertBoldToItal(Xop_ctx ctx, byte[] src, Xop_apos_tkn oldTkn) {
-		ctx.Msg_log().Add_itm_none(Xop_apos_log.Bold_converted_to_ital, src, oldTkn.Src_bgn(), oldTkn.Src_end());
+	private static void Convert_bold_to_ital(Xop_ctx ctx, byte[] src, Xop_apos_tkn oldTkn) {
 		oldTkn.Apos_tid_(Xop_apos_tkn_.Typ_ital).Apos_cmd_(Xop_apos_tkn_.Cmd_i_bgn).Apos_lit_(oldTkn.Apos_lit() + 1);// NOTE: Cmd_i_bgn may be overridden later
 	}
-	private void Reset() {
-		bold_count = ital_count = 0;
-		dual_tkn = null;
-		stack.Clear();
-		dat.State_clear();
-	}
-	private static Xop_apos_tkn Previous_bgn(List_adp stack, int typ) {
-		int stack_len = stack.Count();
-		for (int i = stack_len - 1; i > -1; --i) {
-			Xop_apos_tkn apos = (Xop_apos_tkn)stack.Get_at(i);
-			int cmd = apos.Apos_cmd();
-			switch (typ) {
-				case Xop_apos_tkn_.Typ_ital:
-					switch (cmd) {
-						case Xop_apos_tkn_.Cmd_i_bgn:
-						case Xop_apos_tkn_.Cmd_ib_bgn:
-						case Xop_apos_tkn_.Cmd_bi_bgn:
-						case Xop_apos_tkn_.Cmd_ib_end__i_bgn:
-						case Xop_apos_tkn_.Cmd_b_end__i_bgn:
-							return apos;
-					}
-					break;
-				case Xop_apos_tkn_.Typ_bold:
-					switch (cmd) {
-						case Xop_apos_tkn_.Cmd_b_bgn:
-						case Xop_apos_tkn_.Cmd_ib_bgn:
-						case Xop_apos_tkn_.Cmd_bi_bgn:
-						case Xop_apos_tkn_.Cmd_bi_end__b_bgn:
-						case Xop_apos_tkn_.Cmd_i_end__b_bgn:
-							return apos;
-					}
-					break;
-				default:	// NOTE: this is approximate; will not be exact in most dual situations; EX: <b>a<i>b will return <i>; should return <b> and <i>
-					switch (cmd) {
-						case Xop_apos_tkn_.Cmd_b_bgn:
-						case Xop_apos_tkn_.Cmd_i_bgn:
-						case Xop_apos_tkn_.Cmd_ib_bgn:
-						case Xop_apos_tkn_.Cmd_bi_bgn:
-						case Xop_apos_tkn_.Cmd_bi_end__b_bgn:
-						case Xop_apos_tkn_.Cmd_i_end__b_bgn:
-						case Xop_apos_tkn_.Cmd_ib_end__i_bgn:
-						case Xop_apos_tkn_.Cmd_b_end__i_bgn:
-							return apos;
-					}
-					break;
-			}
-		}
-		return null;
-	}
 }
diff --git a/400_xowa/src/gplx/xowa/parsers/hdrs/Xop_hdr_wkr.java b/400_xowa/src/gplx/xowa/parsers/hdrs/Xop_hdr_wkr.java
index a32e292af..f1b7ea06b 100644
--- a/400_xowa/src/gplx/xowa/parsers/hdrs/Xop_hdr_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/hdrs/Xop_hdr_wkr.java
@@ -32,7 +32,7 @@ public class Xop_hdr_wkr implements Xop_ctx_wkr {
 	}
 	public int Make_tkn_bgn(Xop_ctx ctx, Xop_tkn_mkr tkn_mkr, Xop_root_tkn root, byte[] src, int src_len, int bgn_pos, int cur_pos) {
 		if (bgn_pos == Xop_parser_.Doc_bgn_bos) bgn_pos = 0;	// do not allow -1 pos
-		ctx.Apos().EndFrame(ctx, root, src, bgn_pos, false);
+		ctx.Apos().End_frame(ctx, root, src, bgn_pos, false);
 		Close_open_itms(ctx, tkn_mkr, root, src, src_len, bgn_pos, cur_pos);
 		ctx.Para().Process_block__bgn__nl_w_symbol(ctx, root, src, bgn_pos, cur_pos, Xop_xnde_tag_.Tag__h2);	// pass h2; should pass h# where # is correct #, but for purpose of Para_wkr, <h2> tag does not matter
 		int new_pos = Bry_find_.Find_fwd_while(src, cur_pos, src_len, Xop_hdr_lxr.Hook);				// count all =
@@ -50,7 +50,7 @@ public class Xop_hdr_wkr implements Xop_ctx_wkr {
 	public int Make_tkn_end(Xop_ctx ctx, Xop_tkn_mkr tkn_mkr, Xop_root_tkn root, byte[] src, int src_len, int bgn_pos, int cur_pos, int stackPos, int end_hdr_len) {// REF.MW: Parser|doHeadings
 		if (ctx.Cur_tkn_tid() == Xop_tkn_itm_.Tid_tmpl_curly_bgn) return ctx.Lxr_make_txt_(cur_pos);
 		Xop_hdr_tkn hdr = (Xop_hdr_tkn)ctx.Stack_pop_til(root, src, stackPos, false, bgn_pos, cur_pos, Xop_tkn_itm_.Tid_hdr);
-		ctx.Apos().EndFrame(ctx, root, src, bgn_pos, false);	// end any apos; EX: ==''a==
+		ctx.Apos().End_frame(ctx, root, src, bgn_pos, false);	// end any apos; EX: ==''a==
 		int hdr_len = hdr.Hdr_level(), bgn_manual = 0, end_manual = 0;
 		boolean dirty = false;
 		if		(end_hdr_len < hdr_len) {	// mismatch: end has more; adjust hdr
diff --git a/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_parser.java b/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_parser.java
index 128247dad..36b4408a9 100644
--- a/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_parser.java
+++ b/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_parser.java
@@ -43,13 +43,14 @@ public class Mwh_doc_parser {
 					pos = Parse_nde(pos);
 					break;
 				case Byte_ascii.Amp:		// "&": check for entity; EX: &nbsp; in sr-ec -> sr-el
-					Xop_tkn_itm tkn = amp_mgr.Parse_as_tkn(tkn_mkr, src, src_end, pos, pos + 1);
-					if (tkn == null)
+					Xop_amp_mgr_rslt rv = amp_mgr.Parse_tkn(tkn_mkr, src, src_end, pos, pos + 1);
+					Xop_tkn_itm rv_tkn = rv.Tkn();
+					if (rv_tkn == null)
 						++pos;
 					else {
 						wkr.On_txt_end(this, src, cur_nde_tid, txt_bgn, pos);
-						wkr.On_entity_end(this, src, cur_nde_tid, tkn.Src_bgn(), tkn.Src_end());
-						pos = tkn.Src_end();
+						wkr.On_entity_end(this, src, cur_nde_tid, rv_tkn.Src_bgn(), rv_tkn.Src_end());
+						pos = rv_tkn.Src_end();
 						txt_bgn = pos;
 					}
 					break;
diff --git a/400_xowa/src/gplx/xowa/parsers/lists/Xop_list_wkr.java b/400_xowa/src/gplx/xowa/parsers/lists/Xop_list_wkr.java
index 3ff3e4eb0..59275fb54 100644
--- a/400_xowa/src/gplx/xowa/parsers/lists/Xop_list_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/lists/Xop_list_wkr.java
@@ -40,7 +40,7 @@ public class Xop_list_wkr implements Xop_ctx_wkr {
 		if (acsPos != -1) ctx.Stack_pop_til(root, src, acsPos, true, bgn_pos, cur_pos, Xop_tkn_itm_.Tid_list);
 
 		// close apos
-		ctx.Apos().EndFrame(ctx, root, src, bgn_pos, false);
+		ctx.Apos().End_frame(ctx, root, src, bgn_pos, false);
 		byte symByt = src[cur_pos - 1];  // -1 b/c symByt is byte before curByt; EX: \n*a; cur_pos is at a; want to get *
 		int prvSymLen = curSymLen;
 		cur_pos = SymAry_fill(src, cur_pos, src_len, symByt);
diff --git a/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__basic_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__basic_tst.java
index f005b401e..bd9d82719 100644
--- a/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__basic_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__basic_tst.java
@@ -21,12 +21,14 @@ import gplx.xowa.langs.*; import gplx.xowa.langs.cases.*; import gplx.xowa.langs
 import gplx.xowa.wikis.nss.*;
 import gplx.xowa.parsers.paras.*; import gplx.xowa.wikis.ttls.*;
 public class Xop_lnki_wkr__basic_tst {
-	@Before public void init() {fxt.Reset(); fxt.Init_para_n_();} private final Xop_fxt fxt = new Xop_fxt();
+	@Before public void init() {fxt.Reset(); fxt.Init_para_n_();} private final    Xop_fxt fxt = new Xop_fxt();
 	@Test  public void Basic() {
 		fxt.Test_parse_page_wiki("[[a]]", fxt.tkn_lnki_().Trg_tkn_(fxt.tkn_arg_val_txt_(2, 3)));
 	}
 	@Test  public void HtmlRef() {
-		fxt.Test_parse_page_wiki("[[a&amp;b]]", fxt.tkn_lnki_().Trg_tkn_(fxt.tkn_arg_nde_().Val_tkn_(fxt.tkn_arg_itm_(fxt.tkn_txt_(2, 3), fxt.tkn_html_ref_("&amp;"), fxt.tkn_txt_(8, 9)))));
+		fxt.Test_parse_page_wiki_str("[[a&amp;b]]"
+		, "<a href=\"/wiki/A%26b\">a&amp;b</a>"
+		);
 	}
 	@Test  public void Url_encode() {	// PURPOSE:title should automatically do url decoding; DATE:2013-08-26
 		fxt.Test_parse_page_all_str("[[A%20b]]", "<a href=\"/wiki/A_b\">A b</a>");
diff --git a/400_xowa/src/gplx/xowa/parsers/miscs/Xop_hr_lxr.java b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_hr_lxr.java
index ba10cd035..c93a8a8ee 100644
--- a/400_xowa/src/gplx/xowa/parsers/miscs/Xop_hr_lxr.java
+++ b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_hr_lxr.java
@@ -30,7 +30,7 @@ public class Xop_hr_lxr implements Xop_lxr {
 			bgn_pos = 0;	// do not allow -1 pos
 			nl_adj = 0;		// no nl at bgn, so nl_adj = 0
 		}
-		ctx.Apos().EndFrame(ctx, root, src, bgn_pos, false);
+		ctx.Apos().End_frame(ctx, root, src, bgn_pos, false);
 		ctx.CloseOpenItms(ctx, tkn_mkr, root, src, src_len, bgn_pos, cur_pos);		// close open items
 		cur_pos = Bry_find_.Find_fwd_while(src, cur_pos, src_len, Hook_byt);	// gobble consecutive dashes
 		if (!bos)
diff --git a/400_xowa/src/gplx/xowa/parsers/paras/Xop_nl_lxr.java b/400_xowa/src/gplx/xowa/parsers/paras/Xop_nl_lxr.java
index 1af98a340..1a717f98a 100644
--- a/400_xowa/src/gplx/xowa/parsers/paras/Xop_nl_lxr.java
+++ b/400_xowa/src/gplx/xowa/parsers/paras/Xop_nl_lxr.java
@@ -51,7 +51,7 @@ public class Xop_nl_lxr implements Xop_lxr {
 			}
 		}
 
-		ctx.Apos().EndFrame(ctx, root, src, bgn_pos, true);	// NOTE: frame should at end at bgn_pos (before \n) not after; else, will create tkn at (5,5), while tkn_mkr.Space creates one at (4,5); DATE:2013-10-31
+		ctx.Apos().End_frame(ctx, root, src, bgn_pos, true);	// NOTE: frame should at end at bgn_pos (before \n) not after; else, will create tkn at (5,5), while tkn_mkr.Space creates one at (4,5); DATE:2013-10-31
 		ctx.Tblw().Cell_pipe_seen_(false);	// flip off "|" in tblw seq; EX: "| a\n||" needs to flip off "|" else "||" will be seen as style dlm"; NOTE: not covered by test?
 
 		Xop_para_wkr para_wkr = ctx.Para();
@@ -113,5 +113,5 @@ public class Xop_nl_lxr implements Xop_lxr {
 		}
 		return Bry_find_.Not_found;
 	}
-	public static final Xop_nl_lxr Instance = new Xop_nl_lxr(); Xop_nl_lxr() {}
+	public static final    Xop_nl_lxr Instance = new Xop_nl_lxr(); Xop_nl_lxr() {}
 }
diff --git a/400_xowa/src/gplx/xowa/parsers/paras/Xop_para_wkr_pre_tst.java b/400_xowa/src/gplx/xowa/parsers/paras/Xop_para_wkr_pre_tst.java
index 57cd18f1d..9bc0cc44d 100644
--- a/400_xowa/src/gplx/xowa/parsers/paras/Xop_para_wkr_pre_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/paras/Xop_para_wkr_pre_tst.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.parsers.paras; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
 import org.junit.*;
 public class Xop_para_wkr_pre_tst {
-	@Before public void init() {fxt.Reset(); fxt.Init_para_y_();} private final Xop_fxt fxt = new Xop_fxt();
+	@Before public void init() {fxt.Reset(); fxt.Init_para_y_();} private final    Xop_fxt fxt = new Xop_fxt();
 	@After public void teardown() {fxt.Init_para_n_();}
 	@Test  public void Pre_ignore_bos() {			// PURPOSE: ignore pre at bgn; DATE:2013-07-09
 		fxt.Test_parse_page_all_str(String_.Concat_lines_nl
@@ -57,7 +57,7 @@ public class Xop_para_wkr_pre_tst {
 		));
 	}
 	@Test  public void Ignore_pre_in_gallery() {// PURPOSE: pre in gallery should be ignored; EX:uk.w:EP2; DATE:2014-03-11
-		gplx.xowa.xtns.gallery.Gallery_mgr_base.File_found_mode = Bool_.Y_byte;
+		gplx.xowa.xtns.gallery.Gallery_mgr_wtr.File_found_mode = Bool_.Y_byte;
 		fxt.Test_parse_page_wiki_str(String_.Concat_lines_nl_skip_last
 		( "a"
 		, ""
@@ -82,10 +82,10 @@ public class Xop_para_wkr_pre_tst {
 		, "</ul>"
 		,""
 		));
-		gplx.xowa.xtns.gallery.Gallery_mgr_base.File_found_mode = Bool_.N_byte;
+		gplx.xowa.xtns.gallery.Gallery_mgr_wtr.File_found_mode = Bool_.N_byte;
 	}
 	@Test  public void Pre_xnde_gallery() {	// PURPOSE: <gallery> should invalidate pre; EX: en.w:Mary, Queen of Scots
-		gplx.xowa.xtns.gallery.Gallery_mgr_base.File_found_mode = Bool_.Y_byte;
+		gplx.xowa.xtns.gallery.Gallery_mgr_wtr.File_found_mode = Bool_.Y_byte;
 		fxt.Wiki().Xtn_mgr().Init_by_wiki(fxt.Wiki());
 		String raw = String_.Concat_lines_nl_skip_last
 			( " <gallery>"
@@ -109,7 +109,7 @@ public class Xop_para_wkr_pre_tst {
 			, "  </li>"
 			, "</ul>"
 			));
-		gplx.xowa.xtns.gallery.Gallery_mgr_base.File_found_mode = Bool_.N_byte;
+		gplx.xowa.xtns.gallery.Gallery_mgr_wtr.File_found_mode = Bool_.N_byte;
 	}
 	@Test  public void Ignore_pre_in_center() {// PURPOSE: pre in gallery should be ignored; EX:uk.w:EP2; DATE:2014-03-11
 		fxt.Test_parse_page_wiki_str(String_.Concat_lines_nl_skip_last
diff --git a/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_wkr.java b/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_wkr.java
index 071a860c4..f183424f5 100644
--- a/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/tblws/Xop_tblw_wkr.java
@@ -47,7 +47,7 @@ public class Xop_tblw_wkr implements Xop_ctx_wkr {
 			}
 		}
 		if (ctx.Apos().Stack_len() > 0)							// open apos; note that apos keeps its own stack, as they are not "structural" (not sure about this)
-			ctx.Apos().EndFrame(ctx, root, src, cur_pos, true);	// close it
+			ctx.Apos().End_frame(ctx, root, src, cur_pos, true);// close it
 		Xop_tblw_tkn prv_tkn = ctx.Stack_get_tbl();
 		if (	prv_tkn == null									// prv_tkn not found; i.e.: no earlier "{|" or "<table>"
 			|| (	ctx.Stack_get_tblw_tb() == null				// no {| on stack; DATE:2014-05-05
diff --git a/400_xowa/src/gplx/xowa/parsers/tmpls/Nowiki_escape_itm.java b/400_xowa/src/gplx/xowa/parsers/tmpls/Nowiki_escape_itm.java
index 7d7ec674e..f83c02d66 100644
--- a/400_xowa/src/gplx/xowa/parsers/tmpls/Nowiki_escape_itm.java
+++ b/400_xowa/src/gplx/xowa/parsers/tmpls/Nowiki_escape_itm.java
@@ -43,25 +43,27 @@ public class Nowiki_escape_itm {
 		}
 		return dirty;
 	}
-	private static final byte[] Pre_bry = new byte[] {Byte_ascii.Nl, Byte_ascii.Space};	// NOTE: must go before trie_new
-	private static final Btrie_slim_mgr trie = trie_new();
-	private static Btrie_slim_mgr trie_new() {
+
+	private static final    Btrie_slim_mgr trie = New_trie();
+	private static Btrie_slim_mgr New_trie() {
+		byte[] pre_bry = new byte[] {Byte_ascii.Nl, Byte_ascii.Space};	// NOTE: must go before New_trie
 		Btrie_slim_mgr rv = Btrie_slim_mgr.cs();
-		trie_new_itm(rv, Byte_ascii.Lt_bry				, Xop_amp_trie.Bry_xowa_lt);
-		trie_new_itm(rv, Byte_ascii.Brack_bgn_bry		, Xop_amp_trie.Bry_xowa_brack_bgn);
-		trie_new_itm(rv, Byte_ascii.Brack_end_bry		, Xop_amp_trie.Bry_xowa_brack_end);	// PAGE:en.w: Tall_poppy_syndrome DATE:2014-07-23
-		trie_new_itm(rv, Byte_ascii.Pipe_bry			, Xop_amp_trie.Bry_xowa_pipe);
-		trie_new_itm(rv, Byte_ascii.Apos_bry			, Xop_amp_trie.Bry_xowa_apos);		// NOTE: for backward compatibility, use &apos; note that amp_wkr will turn &apos; -> &#39 but &#39 -> '; DATE:2014-07-03
-		trie_new_itm(rv, Byte_ascii.Colon_bry			, Xop_amp_trie.Bry_xowa_colon);
-		trie_new_itm(rv, Byte_ascii.Underline_bry		, Xop_amp_trie.Bry_xowa_underline);
-		trie_new_itm(rv, Byte_ascii.Star_bry			, Xop_amp_trie.Bry_xowa_asterisk);
-		trie_new_itm(rv, Byte_ascii.Dash_bry			, Xop_amp_trie.Bry_xowa_dash);		// needed to handle "|<nowiki>-</nowiki>"; PAGE:de.w:Liste_von_Vereinen_und_Vereinigungen_von_Gl�ubigen_(r�misch-katholische_Kirche) DATE:2015-01-08
-		trie_new_itm(rv, Byte_ascii.Space_bry			, Xop_amp_trie.Bry_xowa_space);
-		trie_new_itm(rv, Byte_ascii.Nl_bry				, Xop_amp_trie.Bry_xowa_nl);
-		trie_new_itm(rv, Pre_bry						, Pre_bry);
+		New_trie_itm(rv, Byte_ascii.Lt_bry				, Xop_amp_trie.Str__xowa_lt);
+		New_trie_itm(rv, Byte_ascii.Brack_bgn_bry		, Xop_amp_trie.Str__xowa_brack_bgn);
+		New_trie_itm(rv, Byte_ascii.Brack_end_bry		, Xop_amp_trie.Str__xowa_brack_end);// PAGE:en.w: Tall_poppy_syndrome DATE:2014-07-23
+		New_trie_itm(rv, Byte_ascii.Pipe_bry			, Xop_amp_trie.Str__xowa_pipe);
+		New_trie_itm(rv, Byte_ascii.Apos_bry			, Xop_amp_trie.Str__xowa_apos);		// NOTE: for backward compatibility, use &apos; note that amp_wkr will turn &apos; -> &#39 but &#39 -> '; DATE:2014-07-03
+		New_trie_itm(rv, Byte_ascii.Colon_bry			, Xop_amp_trie.Str__xowa_colon);
+		New_trie_itm(rv, Byte_ascii.Underline_bry		, Xop_amp_trie.Str__xowa_underline);
+		New_trie_itm(rv, Byte_ascii.Star_bry			, Xop_amp_trie.Str__xowa_asterisk);
+		New_trie_itm(rv, Byte_ascii.Dash_bry			, Xop_amp_trie.Str__xowa_dash);		// needed to handle "|<nowiki>-</nowiki>"; PAGE:de.w:Liste_von_Vereinen_und_Vereinigungen_von_Gl�ubigen_(r�misch-katholische_Kirche) DATE:2015-01-08
+		New_trie_itm(rv, Byte_ascii.Space_bry			, Xop_amp_trie.Str__xowa_space);
+		New_trie_itm(rv, Byte_ascii.Nl_bry				, Xop_amp_trie.Str__xowa_nl);
+		New_trie_itm(rv, pre_bry						, pre_bry);
 		return rv;
 	}		
-	private static void trie_new_itm(Btrie_slim_mgr rv, byte[] src, byte[] trg) {
+	private static void New_trie_itm(Btrie_slim_mgr rv, byte[] src, String trg) {New_trie_itm(rv, src, Bry_.new_u8(trg));}
+	private static void New_trie_itm(Btrie_slim_mgr rv, byte[] src, byte[] trg) {
 		Nowiki_escape_itm itm = new Nowiki_escape_itm(src, trg);
 		rv.Add_obj(src, itm);			
 	}
diff --git a/400_xowa/src/gplx/xowa/parsers/utils/Xop_sanitizer.java b/400_xowa/src/gplx/xowa/parsers/utils/Xop_sanitizer.java
index 0056e042a..a5e84482a 100644
--- a/400_xowa/src/gplx/xowa/parsers/utils/Xop_sanitizer.java
+++ b/400_xowa/src/gplx/xowa/parsers/utils/Xop_sanitizer.java
@@ -81,12 +81,13 @@ public class Xop_sanitizer {
 									break;
 								case Xop_amp_trie_itm.Tid_num_dec:
 								case Xop_amp_trie_itm.Tid_num_hex:
-									boolean pass = amp_mgr.Parse_as_int(itm_tid == Xop_amp_trie_itm.Tid_num_hex, src, end, pos - 1, pos + itm.Xml_name_bry().length);
-									if (pass)
-										bfr.Add_u8_int(amp_mgr.Rslt_val());
+									Xop_amp_mgr_rslt rv = new Xop_amp_mgr_rslt();
+									amp_mgr.Parse_ncr(rv, itm_tid == Xop_amp_trie_itm.Tid_num_hex, src, end, pos - 1, pos + itm.Xml_name_bry().length);
+									if (rv.Pass())
+										bfr.Add_u8_int(rv.Val());
 									else
 										bfr.Add_byte(Byte_ascii.Amp);
-									pos = amp_mgr.Rslt_pos();
+									pos = rv.Pos();
 									break;
 							}
 						}
diff --git a/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_wkr__tidy_tst.java b/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_wkr__tidy_tst.java
index 943082fc4..749306644 100644
--- a/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_wkr__tidy_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_wkr__tidy_tst.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.parsers.xndes; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
 import org.junit.*;
 public class Xop_xnde_wkr__tidy_tst {
-	private final Xop_fxt fxt = new Xop_fxt();
+	private final    Xop_fxt fxt = new Xop_fxt();
 	@After public void term() {fxt.Init_para_n_();}
 	@Test  public void Sub_sup_autocorrect() {
 		fxt.Test_parse_page_wiki_str("<sub>a</sup>b", "<sub>a</sub>b");
diff --git a/400_xowa/src/gplx/xowa/parsers2/Xop_parser_mgr.java b/400_xowa/src/gplx/xowa/parsers2/Xop_parser_mgr.java
new file mode 100644
index 000000000..e1073555b
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/parsers2/Xop_parser_mgr.java
@@ -0,0 +1,31 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.parsers2; import gplx.*; import gplx.xowa.*;
+class Xop_parser_mgr {
+//		public Xop_parser_env Envs__get_or_new() {
+//			return null;
+//		}
+	public Xop_parser_wkr Wkrs__get_or_new() {
+		return null;
+	}
+}
+interface Xop_parser_env {
+}
+interface Xop_parser_wkr {
+	void Parse_to_bfr(Xop_parser_env env, Bry_bfr bfr, byte[] src);
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/Xowv_wiki.java b/400_xowa/src/gplx/xowa/wikis/Xowv_wiki.java
index 4928ecea2..20c6e2afe 100644
--- a/400_xowa/src/gplx/xowa/wikis/Xowv_wiki.java
+++ b/400_xowa/src/gplx/xowa/wikis/Xowv_wiki.java
@@ -40,7 +40,7 @@ public class Xowv_wiki implements Xow_wiki, Xow_ttl_parser, Gfo_invk {
 		this.domain_tid = domain_itm.Domain_type_id();
 		this.domain_abrv = Xow_abrv_wm_.To_abrv(Xow_domain_itm_.parse(domain_bry));
 		this.ns_mgr = Xow_ns_mgr_.default_(app.Utl_case_mgr());
-		this.lang = app.Lang_mgr().Get_by(domain_itm.Lang_actl_key());
+		this.lang = app.Lang_mgr().Get_by_or_en(domain_itm.Lang_actl_key());	// NOTE: must not be null, or causes null ref exception on redlinks in drd; DATE:2016-06-28
 		this.html__hdump_mgr = new Xow_hdump_mgr(this);
 		this.special_mgr = new Xosp_special_mgr(this);
 		this.fsys_mgr = new Xow_fsys_mgr(wiki_root_dir, app.Fsys_mgr().File_dir().GenSubDir(domain_str));
diff --git a/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_all.java b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_all.java
index 578768888..8436c3c77 100644
--- a/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_all.java
+++ b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_all.java
@@ -153,10 +153,3 @@ class Xoctg_fmtr_all {
 	,	Div_id_file			= Bry_.new_a7("mw-category-media")
 	;
 }
-interface Xoctg_fmtr_itm extends gplx.core.brys.Bfr_arg {
-	int Grp_end_idx();
-	boolean Grp_end_at_col();
-	int Col_idx(); void Col_idx_(int col_idx, int col_bgn);
-	void Init_from_all(Xowe_wiki wiki, Xol_lang_itm lang, Xoh_wtr_ctx hctx, Xoctg_view_ctg ctg, Xoctg_fmtr_all mgr, Xoctg_view_grp itms_list, int itms_list_len);
-	void Init_from_grp(byte[] grp_ttl, int i);
-}
diff --git a/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm.java b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm.java
index bcf6b4de9..be570b360 100644
--- a/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm.java
+++ b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm.java
@@ -16,109 +16,11 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.wikis.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*;
-import gplx.core.brys.fmtrs.*;
-import gplx.xowa.htmls.*; import gplx.xowa.htmls.hrefs.*; import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*; import gplx.xowa.htmls.core.htmls.*;
-import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*;
-import gplx.xowa.users.history.*;
-abstract class Xoctg_fmtr_itm_base implements gplx.core.brys.Bfr_arg, Xoctg_fmtr_itm {
-	private Xou_history_mgr history_mgr; private Xoh_wtr_ctx hctx;
-	protected Xowe_wiki wiki; Xol_lang_itm lang; Xoctg_view_ctg ctg; protected int len; protected Xoh_href_parser href_parser; protected Bry_fmtr html_itm, html_itm_missing; protected Xoctg_view_grp list; protected Xow_msg_mgr msg_mgr;
-	public void Init_from_all(Xowe_wiki wiki, Xol_lang_itm lang, Xoh_wtr_ctx hctx, Xoctg_view_ctg ctg, Xoctg_fmtr_all mgr, Xoctg_view_grp itms_list, int itms_list_len) {
-		this.wiki = wiki; this.lang = lang; this.hctx = hctx; this.ctg = ctg; this.list = itms_list; this.len = itms_list_len; this.msg_mgr = wiki.Msg_mgr();
-		href_parser = wiki.Appe().Html__href_parser();
-		html_itm = mgr.Html_itm();
-		html_itm_missing = mgr.Html_itm_missing();
-		history_mgr = wiki.Appe().Usere().History_mgr();
-	}
-	public void Init_from_grp(byte[] ttl_char_0, int col_bgn) {this.ttl_char_0 = ttl_char_0; this.col_bgn = col_bgn;} private byte[] ttl_char_0; int col_bgn; int col_end;
-	public int Col_idx() {return col_idx;}
-	public void Col_idx_(int col_idx, int col_bgn) {
-		this.col_idx = col_idx;
-		this.col_bgn = col_bgn;
-		col_end = col_bgn + Xoctg_fmtr_grp.Calc_col_max(Xoctg_html_mgr.Cols_max, len, col_idx);
-	} int col_idx;
-	public int Grp_end_idx() {return grp_end_idx;} private int grp_end_idx;
-	public boolean Grp_end_at_col() {return grp_end_at_col;} private boolean grp_end_at_col;
-	public void Bfr_arg__add(Bry_bfr bfr) {
-		for (int i = col_bgn; i < len; i++) {
-			if (i == col_end) {
-				grp_end_idx = i;
-				grp_end_at_col = true;
-				return;				
-			}
-			Xoctg_view_itm itm = list.Itms()[i];
-			Xoa_ttl ttl = itm.Ttl();
-			byte[] itm_sortkey = itm.Sort_key();
-			byte[] ttl_bry = ttl.Page_txt();
-			if (!Bry_.Has_at_bgn(itm_sortkey, ttl_char_0, 0, itm_sortkey.length)) {
-				grp_end_idx = i;
-				grp_end_at_col = i == col_end;
-				return;
-			}
-			Bld_html(bfr, wiki, hctx, itm, ttl, ttl_bry, href_parser, html_itm);
-		}
-		grp_end_idx = len;
-		grp_end_at_col = true;
-	}
-	@gplx.Virtual public void Bld_html(Bry_bfr bfr, Xowe_wiki wiki, Xoh_wtr_ctx hctx, Xoctg_view_itm itm, Xoa_ttl ttl, byte[] ttl_page, Xoh_href_parser href_parser, Bry_fmtr html_itm) {
-		byte[] itm_href = wiki.App().Html__href_wtr().Build_to_bry(wiki, ttl);
-		byte[] itm_full_ttl = gplx.langs.htmls.Gfh_utl.Escape_html_as_bry(ttl.Full_txt_w_ttl_case());// NOTE: ttl.Full_txt() to get full ns; EX: Template:A instead of just "A"
-		byte[] itm_atr_cls = hctx.Mode_is_hdump() ? Bry_.Empty : Xoh_lnki_wtr.Lnki_cls_visited(history_mgr, wiki.Domain_bry(), ttl.Page_txt());	// NOTE: must be ttl.Page_txt() in order to match Xou_history_mgr.Add
-		Bry_fmtr fmtr = itm.Missing() ? html_itm_missing : html_itm;
-		fmtr.Bld_bfr_many(bfr, itm_href, itm_full_ttl, itm_full_ttl, itm.Page_id(), itm_atr_cls);
-	}
-}
-class Xoctg_fmtr_itm_page extends Xoctg_fmtr_itm_base {
-	public static final    Xoctg_fmtr_itm_page Instance = new Xoctg_fmtr_itm_page(); Xoctg_fmtr_itm_page() {}
-}
-class Xoctg_fmtr_itm_file extends Xoctg_fmtr_itm_base {
-//		public void Bfr_arg__add(Bry_bfr bfr) {
-//			html_itm = wiki.Html_mgr().Gallery_xtn_mgr().Html_gallery_itm_img();
-//			for (int i = list.Bgn(); i < len; i++) {
-//				Xoctg_view_itm itm = list.Itms()[i];
-//				Xoa_ttl ttl = itm.Ttl();
-//				byte[] ttl_page = ttl.Page_txt();
-//				byte[] itm_href = href_parser.Build_to_bry(ttl, wiki);
-//				html_itm.Bld_bfr_many(bfr
-//					, 155	// "itm_box_width"
-//					, 155	// "itm_div_width"
-//					, 15	// "itm_margin"
-//					, -1	// "img_id"
-//					, ttl_page // "img_ttl"
-//					, itm_href // "img_href"
-//					, Bry_.Empty // "html_src"
-//					, -1 // "img_width"
-//					, -1 // "img_height"
-//					, ttl_page // "itm_caption"
-//					);
-//			}
-//		}
-	public static final    Xoctg_fmtr_itm_file Instance = new Xoctg_fmtr_itm_file(); Xoctg_fmtr_itm_file() {}
-}
-class Xoctg_fmtr_itm_subc extends Xoctg_fmtr_itm_base {
-	@Override public void Bld_html(Bry_bfr bfr, Xowe_wiki wiki, Xoh_wtr_ctx hctx, Xoctg_view_itm itm, Xoa_ttl ttl, byte[] ttl_page, Xoh_href_parser href_parser, Bry_fmtr html_itm) {
-		byte[] itm_href = wiki.App().Html__href_wtr().Build_to_bry(wiki, ttl);
-		int sub_ctgs = 0;	// itm.Subs_ctgs();
-		int sub_pages = 0;	// itm.Subs_pages();
-		int sub_files = 0;	// itm.Subs_files();
-		byte[] contains_title = msg_mgr.Val_by_id_args(Xol_msg_itm_.Id_ctgtree_subc_counts, sub_ctgs, sub_pages, sub_files);
-		byte[] contains_text = Bld_contains_text(sub_ctgs, sub_pages, sub_files);
-		html_itm.Bld_bfr_many(bfr, ttl.Page_db(), ttl_page, itm_href, ttl_page, contains_title, contains_text);
-	}
-	byte[] Bld_contains_text(int sub_ctgs, int sub_pages, int sub_files) {
-		if (sub_ctgs == 0 && sub_pages == 0 && sub_files == 0) return Bry_.Empty;
-		Bry_bfr bfr = wiki.Utl__bfr_mkr().Get_b128();
-		bfr.Add_byte(Byte_ascii.Paren_bgn);
-		Bld_contains_text_itm(bfr, Xol_msg_itm_.Id_ctgtree_subc_counts_ctg, sub_ctgs);
-		Bld_contains_text_itm(bfr, Xol_msg_itm_.Id_ctgtree_subc_counts_page, sub_pages);
-		Bld_contains_text_itm(bfr, Xol_msg_itm_.Id_ctgtree_subc_counts_file, sub_files);
-		bfr.Add_byte(Byte_ascii.Paren_end);
-		return bfr.To_bry_and_rls();
-	}
-	private void Bld_contains_text_itm(Bry_bfr bfr, int msg_id, int val) {
-		if (val == 0) return;
-		if (bfr.Len() > 1) bfr.Add(Bld_contains_text_itm_dlm);	// NOTE: 1 b/c Paren_bgn is always added
-		bfr.Add(msg_mgr.Val_by_id_args(msg_id, val));
-	}	static final    byte[] Bld_contains_text_itm_dlm = Bry_.new_a7(", "); 
-	public static final    Xoctg_fmtr_itm_subc Instance = new Xoctg_fmtr_itm_subc(); Xoctg_fmtr_itm_subc() {}
+import gplx.xowa.langs.*; import gplx.xowa.htmls.core.htmls.*;
+interface Xoctg_fmtr_itm extends gplx.core.brys.Bfr_arg {
+	int Grp_end_idx();
+	boolean Grp_end_at_col();
+	int Col_idx(); void Col_idx_(int col_idx, int col_bgn);
+	void Init_from_all(Xowe_wiki wiki, Xol_lang_itm lang, Xoh_wtr_ctx hctx, Xoctg_view_ctg ctg, Xoctg_fmtr_all mgr, Xoctg_view_grp itms_list, int itms_list_len);
+	void Init_from_grp(byte[] grp_ttl, int i);
 }
diff --git a/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_base.java b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_base.java
new file mode 100644
index 000000000..a53099638
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_base.java
@@ -0,0 +1,70 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*;
+import gplx.core.brys.fmtrs.*;
+import gplx.xowa.htmls.*; import gplx.xowa.htmls.hrefs.*; import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*; import gplx.xowa.htmls.core.htmls.*;
+import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*;
+import gplx.xowa.users.history.*;
+abstract class Xoctg_fmtr_itm_base implements gplx.core.brys.Bfr_arg, Xoctg_fmtr_itm {
+	private Xou_history_mgr history_mgr; private Xoh_wtr_ctx hctx;
+	protected Xowe_wiki wiki; Xol_lang_itm lang; Xoctg_view_ctg ctg; protected int len; protected Xoh_href_parser href_parser; protected Bry_fmtr html_itm, html_itm_missing; protected Xoctg_view_grp list; protected Xow_msg_mgr msg_mgr;
+	public void Init_from_all(Xowe_wiki wiki, Xol_lang_itm lang, Xoh_wtr_ctx hctx, Xoctg_view_ctg ctg, Xoctg_fmtr_all mgr, Xoctg_view_grp itms_list, int itms_list_len) {
+		this.wiki = wiki; this.lang = lang; this.hctx = hctx; this.ctg = ctg; this.list = itms_list; this.len = itms_list_len; this.msg_mgr = wiki.Msg_mgr();
+		href_parser = wiki.Appe().Html__href_parser();
+		html_itm = mgr.Html_itm();
+		html_itm_missing = mgr.Html_itm_missing();
+		history_mgr = wiki.Appe().Usere().History_mgr();
+	}
+	public void Init_from_grp(byte[] ttl_char_0, int col_bgn) {this.ttl_char_0 = ttl_char_0; this.col_bgn = col_bgn;} private byte[] ttl_char_0; int col_bgn; int col_end;
+	public int Col_idx() {return col_idx;}
+	public void Col_idx_(int col_idx, int col_bgn) {
+		this.col_idx = col_idx;
+		this.col_bgn = col_bgn;
+		col_end = col_bgn + Xoctg_fmtr_grp.Calc_col_max(Xoctg_html_mgr.Cols_max, len, col_idx);
+	} int col_idx;
+	public int Grp_end_idx() {return grp_end_idx;} private int grp_end_idx;
+	public boolean Grp_end_at_col() {return grp_end_at_col;} private boolean grp_end_at_col;
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		for (int i = col_bgn; i < len; i++) {
+			if (i == col_end) {
+				grp_end_idx = i;
+				grp_end_at_col = true;
+				return;				
+			}
+			Xoctg_view_itm itm = list.Itms()[i];
+			Xoa_ttl ttl = itm.Ttl();
+			byte[] itm_sortkey = itm.Sort_key();
+			byte[] ttl_bry = ttl.Page_txt();
+			if (!Bry_.Has_at_bgn(itm_sortkey, ttl_char_0, 0, itm_sortkey.length)) {
+				grp_end_idx = i;
+				grp_end_at_col = i == col_end;
+				return;
+			}
+			Bld_html(bfr, wiki, hctx, itm, ttl, ttl_bry, href_parser, html_itm);
+		}
+		grp_end_idx = len;
+		grp_end_at_col = true;
+	}
+	@gplx.Virtual public void Bld_html(Bry_bfr bfr, Xowe_wiki wiki, Xoh_wtr_ctx hctx, Xoctg_view_itm itm, Xoa_ttl ttl, byte[] ttl_page, Xoh_href_parser href_parser, Bry_fmtr html_itm) {
+		byte[] itm_href = wiki.App().Html__href_wtr().Build_to_bry(wiki, ttl);
+		byte[] itm_full_ttl = gplx.langs.htmls.Gfh_utl.Escape_html_as_bry(ttl.Full_txt_w_ttl_case());// NOTE: ttl.Full_txt() to get full ns; EX: Template:A instead of just "A"
+		byte[] itm_atr_cls = hctx.Mode_is_hdump() ? Bry_.Empty : Xoh_lnki_wtr.Lnki_cls_visited(history_mgr, wiki.Domain_bry(), ttl.Page_txt());	// NOTE: must be ttl.Page_txt() in order to match Xou_history_mgr.Add
+		Bry_fmtr fmtr = itm.Missing() ? html_itm_missing : html_itm;
+		fmtr.Bld_bfr_many(bfr, itm_href, itm_full_ttl, itm_full_ttl, itm.Page_id(), itm_atr_cls);
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_page.java b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_page.java
new file mode 100644
index 000000000..01570557a
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_page.java
@@ -0,0 +1,45 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*;
+class Xoctg_fmtr_itm_page extends Xoctg_fmtr_itm_base {
+	public static final    Xoctg_fmtr_itm_page Instance = new Xoctg_fmtr_itm_page(); Xoctg_fmtr_itm_page() {}
+}
+class Xoctg_fmtr_itm_file extends Xoctg_fmtr_itm_base {
+//		public void Bfr_arg__add(Bry_bfr bfr) {
+//			html_itm = wiki.Html_mgr().Gallery_xtn_mgr().Html_gallery_itm_img();
+//			for (int i = list.Bgn(); i < len; i++) {
+//				Xoctg_view_itm itm = list.Itms()[i];
+//				Xoa_ttl ttl = itm.Ttl();
+//				byte[] ttl_page = ttl.Page_txt();
+//				byte[] itm_href = href_parser.Build_to_bry(ttl, wiki);
+//				html_itm.Bld_bfr_many(bfr
+//					, 155	// "itm_box_width"
+//					, 155	// "itm_div_width"
+//					, 15	// "itm_margin"
+//					, -1	// "img_id"
+//					, ttl_page // "img_ttl"
+//					, itm_href // "img_href"
+//					, Bry_.Empty // "html_src"
+//					, -1 // "img_width"
+//					, -1 // "img_height"
+//					, ttl_page // "itm_caption"
+//					);
+//			}
+//		}
+	public static final    Xoctg_fmtr_itm_file Instance = new Xoctg_fmtr_itm_file(); Xoctg_fmtr_itm_file() {}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_subc.java b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_subc.java
new file mode 100644
index 000000000..8e04d706c
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/ctgs/Xoctg_fmtr_itm_subc.java
@@ -0,0 +1,48 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*;
+import gplx.core.brys.fmtrs.*;
+import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.htmls.hrefs.*;
+import gplx.xowa.langs.msgs.*;
+class Xoctg_fmtr_itm_subc extends Xoctg_fmtr_itm_base {
+	@Override public void Bld_html(Bry_bfr bfr, Xowe_wiki wiki, Xoh_wtr_ctx hctx, Xoctg_view_itm itm, Xoa_ttl ttl, byte[] ttl_page, Xoh_href_parser href_parser, Bry_fmtr html_itm) {
+		byte[] itm_href = wiki.App().Html__href_wtr().Build_to_bry(wiki, ttl);
+		int sub_ctgs = 0;	// itm.Subs_ctgs();
+		int sub_pages = 0;	// itm.Subs_pages();
+		int sub_files = 0;	// itm.Subs_files();
+		byte[] contains_title = msg_mgr.Val_by_id_args(Xol_msg_itm_.Id_ctgtree_subc_counts, sub_ctgs, sub_pages, sub_files);
+		byte[] contains_text = Bld_contains_text(sub_ctgs, sub_pages, sub_files);
+		html_itm.Bld_bfr_many(bfr, ttl.Page_db(), ttl_page, itm_href, ttl_page, contains_title, contains_text);
+	}
+	byte[] Bld_contains_text(int sub_ctgs, int sub_pages, int sub_files) {
+		if (sub_ctgs == 0 && sub_pages == 0 && sub_files == 0) return Bry_.Empty;
+		Bry_bfr bfr = wiki.Utl__bfr_mkr().Get_b128();
+		bfr.Add_byte(Byte_ascii.Paren_bgn);
+		Bld_contains_text_itm(bfr, Xol_msg_itm_.Id_ctgtree_subc_counts_ctg, sub_ctgs);
+		Bld_contains_text_itm(bfr, Xol_msg_itm_.Id_ctgtree_subc_counts_page, sub_pages);
+		Bld_contains_text_itm(bfr, Xol_msg_itm_.Id_ctgtree_subc_counts_file, sub_files);
+		bfr.Add_byte(Byte_ascii.Paren_end);
+		return bfr.To_bry_and_rls();
+	}
+	private void Bld_contains_text_itm(Bry_bfr bfr, int msg_id, int val) {
+		if (val == 0) return;
+		if (bfr.Len() > 1) bfr.Add(Bld_contains_text_itm_dlm);	// NOTE: 1 b/c Paren_bgn is always added
+		bfr.Add(msg_mgr.Val_by_id_args(msg_id, val));
+	}	static final    byte[] Bld_contains_text_itm_dlm = Bry_.new_a7(", "); 
+	public static final    Xoctg_fmtr_itm_subc Instance = new Xoctg_fmtr_itm_subc(); Xoctg_fmtr_itm_subc() {}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__id.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__id.java
new file mode 100644
index 000000000..7968f47f1
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__id.java
@@ -0,0 +1,36 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*;
+import gplx.core.criterias.*;
+import gplx.dbs.*; import gplx.dbs.utls.*;
+class Xowd_page_tbl__id extends Xowd_page_tbl__in_wkr__base {
+	private List_adp list;		// list is original list of ids which may have dupes; needed to fill statement (which takes range of bgn - end); DATE:2013-12-08
+	private Ordered_hash hash;	// hash is unique list of ids; needed for fetch from rdr (which indexes by id)
+	public void Init(List_adp list, Ordered_hash hash) {this.list = list; this.hash = hash; this.Fill_idx_fields_only_(true);}
+	@Override protected boolean		Show_progress() {return true;}
+	@Override protected Criteria In_filter(Object[] part_ary) {
+		return Db_crt_.New_in(this.In_fld_name(), part_ary);
+	}
+	@Override protected void Fill_stmt(Db_stmt stmt, int bgn, int end) {
+		for (int i = bgn; i < end; i++) {
+			Xowd_page_itm page = (Xowd_page_itm)list.Get_at(i);
+			stmt.Val_int(page.Id());		
+		}
+	}
+	@Override public Xowd_page_itm Read_data_to_page(Xowd_page_itm rdr_page) {return (Xowd_page_itm)hash.Get_by(rdr_page.Id_val());}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__in_wkr__base.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__in_wkr__base.java
new file mode 100644
index 000000000..f17053a33
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__in_wkr__base.java
@@ -0,0 +1,52 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*;
+import gplx.core.criterias.*;
+import gplx.dbs.*; import gplx.dbs.utls.*;
+abstract class Xowd_page_tbl__in_wkr__base extends Db_in_wkr__base {
+	protected Xowd_page_tbl tbl; private String tbl_name, fld_in_name;
+	public String Tbl_name() {return tbl_name;}
+	public void Ctor(Xowd_page_tbl tbl, String tbl_name, String fld_in_name) {this.tbl = tbl; this.tbl_name = tbl_name; this.fld_in_name = fld_in_name;}
+	public String In_fld_name() {return  fld_in_name;}
+	protected abstract Criteria In_filter(Object[] part_ary);
+	public abstract Xowd_page_itm Read_data_to_page(Xowd_page_itm rdr_page);
+	public boolean Fill_idx_fields_only() {return fill_idx_fields_only;} public void Fill_idx_fields_only_(boolean v) {fill_idx_fields_only = v;} private boolean fill_idx_fields_only;
+	@Override protected Db_qry Make_qry(int bgn, int end) {
+		Object[] part_ary = In_ary(end - bgn);
+		return Db_qry_.select_cols_
+		(	this.Tbl_name()
+		, 	In_filter(part_ary)
+		, 	fill_idx_fields_only ? tbl.Flds_select_idx() : tbl.Flds_select_all()
+		)
+		;
+	}
+	@Override protected void Read_data(Cancelable cancelable, Db_rdr rdr) {
+		Xowd_page_itm temp = new Xowd_page_itm();
+		while (rdr.Move_next()) {
+			if (cancelable.Canceled()) return;
+			if (fill_idx_fields_only)
+				tbl.Read_page__idx(temp, rdr);
+			else
+				tbl.Read_page__all(temp, rdr);
+			Xowd_page_itm page = Read_data_to_page(temp);
+			if (page == null) continue; // page not found
+			temp.Exists_(true);
+			page.Copy(temp);
+		}
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__in_wkrs.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__in_wkrs.java
deleted file mode 100644
index c8b208150..000000000
--- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__in_wkrs.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*;
-import gplx.core.criterias.*;
-import gplx.dbs.*; import gplx.dbs.utls.*;
-import gplx.xowa.wikis.nss.*;
-class Xowd_page_tbl__ttl_ns extends Xowd_page_tbl__in_wkr__base {
-	private Xowd_page_tbl page_tbl;
-	private Xow_ns_mgr ns_mgr; private Ordered_hash hash;
-	@Override protected int Interval() {return 64;}	// NOTE: 96+ overflows; PAGE:en.w:Space_Liability_Convention; DATE:2013-10-24
-	public void Init(Xowd_page_tbl page_tbl, Xow_ns_mgr ns_mgr, Ordered_hash hash) {
-		this.page_tbl = page_tbl;
-		this.ns_mgr = ns_mgr; this.hash = hash;
-	}
-	@Override protected Criteria In_filter(Object[] part_ary) {
-		int len = part_ary.length;
-		Criteria[] crt_ary = new Criteria[len];
-		String fld_ns = tbl.Fld_page_ns(); String fld_ttl = tbl.Fld_page_title();
-		for (int i = 0; i < len; i++)
-			crt_ary[i] = Criteria_.And(Db_crt_.New_eq(fld_ns, 0), Db_crt_.New_eq(fld_ttl, Bry_.Empty));
-		return Criteria_.Or_many(crt_ary);
-	}
-	@Override protected void Fill_stmt(Db_stmt stmt, int bgn, int end) {
-		for (int i = bgn; i < end; i++) {
-			Xowd_page_itm page = (Xowd_page_itm)hash.Get_at(i);
-			stmt.Crt_int(page_tbl.Fld_page_ns(), page.Ns_id());
-			stmt.Crt_bry_as_str(page_tbl.Fld_page_title(), page.Ttl_page_db());
-		}
-	}
-	@Override public Xowd_page_itm Read_data_to_page(Xowd_page_itm rdr_page) {
-		Xow_ns ns = ns_mgr.Ids_get_or_null(rdr_page.Ns_id());
-		if (ns == null) return null;	// NOTE: ns seems to "randomly" be null when threading during redlinks; guard against null; DATE:2014-01-03
-		byte[] ttl_wo_ns = rdr_page.Ttl_page_db();
-		rdr_page.Ttl_(ns, ttl_wo_ns);
-		return (Xowd_page_itm)hash.Get_by(rdr_page.Ttl_full_db());
-	}
-}
-class Xowd_page_tbl__ttl extends Xowd_page_tbl__in_wkr__base {
-	private Ordered_hash hash; private int in_ns;
-	@Override protected int Interval() {return 64;}	// NOTE: 96+ overflows; EX: w:Space_Liability_Convention; DATE:2013-10-24
-	public void Init(Ordered_hash hash, int in_ns) {this.hash = hash; this.in_ns = in_ns;}
-	@Override protected Criteria In_filter(Object[] part_ary) {
-		int len = part_ary.length;
-		Criteria[] crt_ary = new Criteria[len];
-		String fld_ns = tbl.Fld_page_ns(); String fld_ttl = tbl.Fld_page_title();
-		for (int i = 0; i < len; i++)
-			crt_ary[i] = Criteria_.And(Db_crt_.New_eq(fld_ns, in_ns), Db_crt_.New_eq(fld_ttl, Bry_.Empty));
-		return Criteria_.Or_many(crt_ary);
-	}
-	@Override protected void Fill_stmt(Db_stmt stmt, int bgn, int end) {
-		for (int i = bgn; i < end; i++) {
-			Xowd_page_itm page = (Xowd_page_itm)hash.Get_at(i);
-			stmt.Val_int(in_ns);
-			stmt.Val_bry_as_str(page.Ttl_page_db());
-		}
-	}
-	@Override public Xowd_page_itm Read_data_to_page(Xowd_page_itm rdr_page) {return (Xowd_page_itm)hash.Get_by(rdr_page.Ttl_page_db());}
-}
-class Xowd_page_tbl__id extends Xowd_page_tbl__in_wkr__base {
-	private List_adp list;		// list is original list of ids which may have dupes; needed to fill statement (which takes range of bgn - end); DATE:2013-12-08
-	private Ordered_hash hash;	// hash is unique list of ids; needed for fetch from rdr (which indexes by id)
-	public void Init(List_adp list, Ordered_hash hash) {this.list = list; this.hash = hash; this.Fill_idx_fields_only_(true);}
-	@Override protected boolean		Show_progress() {return true;}
-	@Override protected Criteria In_filter(Object[] part_ary) {
-		return Db_crt_.New_in(this.In_fld_name(), part_ary);
-	}
-	@Override protected void Fill_stmt(Db_stmt stmt, int bgn, int end) {
-		for (int i = bgn; i < end; i++) {
-			Xowd_page_itm page = (Xowd_page_itm)list.Get_at(i);
-			stmt.Val_int(page.Id());		
-		}
-	}
-	@Override public Xowd_page_itm Read_data_to_page(Xowd_page_itm rdr_page) {return (Xowd_page_itm)hash.Get_by(rdr_page.Id_val());}
-}
-abstract class Xowd_page_tbl__in_wkr__base extends Db_in_wkr__base {
-	protected Xowd_page_tbl tbl; private String tbl_name, fld_in_name;
-	public String Tbl_name() {return tbl_name;}
-	public void Ctor(Xowd_page_tbl tbl, String tbl_name, String fld_in_name) {this.tbl = tbl; this.tbl_name = tbl_name; this.fld_in_name = fld_in_name;}
-	public String In_fld_name() {return  fld_in_name;}
-	protected abstract Criteria In_filter(Object[] part_ary);
-	public abstract Xowd_page_itm Read_data_to_page(Xowd_page_itm rdr_page);
-	public boolean Fill_idx_fields_only() {return fill_idx_fields_only;} public void Fill_idx_fields_only_(boolean v) {fill_idx_fields_only = v;} private boolean fill_idx_fields_only;
-	@Override protected Db_qry Make_qry(int bgn, int end) {
-		Object[] part_ary = In_ary(end - bgn);
-		return Db_qry_.select_cols_
-		(	this.Tbl_name()
-		, 	In_filter(part_ary)
-		, 	fill_idx_fields_only ? tbl.Flds_select_idx() : tbl.Flds_select_all()
-		)
-		;
-	}
-	@Override protected void Read_data(Cancelable cancelable, Db_rdr rdr) {
-		Xowd_page_itm temp = new Xowd_page_itm();
-		while (rdr.Move_next()) {
-			if (cancelable.Canceled()) return;
-			if (fill_idx_fields_only)
-				tbl.Read_page__idx(temp, rdr);
-			else
-				tbl.Read_page__all(temp, rdr);
-			Xowd_page_itm page = Read_data_to_page(temp);
-			if (page == null) continue; // page not found
-			temp.Exists_(true);
-			page.Copy(temp);
-		}
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl.java
new file mode 100644
index 000000000..741503163
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl.java
@@ -0,0 +1,41 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*;
+import gplx.core.criterias.*;
+import gplx.dbs.*; import gplx.dbs.utls.*;
+class Xowd_page_tbl__ttl extends Xowd_page_tbl__in_wkr__base {
+	private Ordered_hash hash; private int in_ns;
+	@Override protected int Interval() {return 64;}	// NOTE: 96+ overflows; EX: w:Space_Liability_Convention; DATE:2013-10-24
+	public void Init(Ordered_hash hash, int in_ns) {this.hash = hash; this.in_ns = in_ns;}
+	@Override protected Criteria In_filter(Object[] part_ary) {
+		int len = part_ary.length;
+		Criteria[] crt_ary = new Criteria[len];
+		String fld_ns = tbl.Fld_page_ns(); String fld_ttl = tbl.Fld_page_title();
+		for (int i = 0; i < len; i++)
+			crt_ary[i] = Criteria_.And(Db_crt_.New_eq(fld_ns, in_ns), Db_crt_.New_eq(fld_ttl, Bry_.Empty));
+		return Criteria_.Or_many(crt_ary);
+	}
+	@Override protected void Fill_stmt(Db_stmt stmt, int bgn, int end) {
+		for (int i = bgn; i < end; i++) {
+			Xowd_page_itm page = (Xowd_page_itm)hash.Get_at(i);
+			stmt.Val_int(in_ns);
+			stmt.Val_bry_as_str(page.Ttl_page_db());
+		}
+	}
+	@Override public Xowd_page_itm Read_data_to_page(Xowd_page_itm rdr_page) {return (Xowd_page_itm)hash.Get_by(rdr_page.Ttl_page_db());}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl_ns.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl_ns.java
new file mode 100644
index 000000000..b620f91db
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl_ns.java
@@ -0,0 +1,52 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*;
+import gplx.core.criterias.*;
+import gplx.dbs.*; import gplx.dbs.utls.*;
+import gplx.xowa.wikis.nss.*;
+class Xowd_page_tbl__ttl_ns extends Xowd_page_tbl__in_wkr__base {
+	private Xowd_page_tbl page_tbl;
+	private Xow_ns_mgr ns_mgr; private Ordered_hash hash;
+	@Override protected int Interval() {return 64;}	// NOTE: 96+ overflows; PAGE:en.w:Space_Liability_Convention; DATE:2013-10-24
+	public void Init(Xowd_page_tbl page_tbl, Xow_ns_mgr ns_mgr, Ordered_hash hash) {
+		this.page_tbl = page_tbl;
+		this.ns_mgr = ns_mgr; this.hash = hash;
+	}
+	@Override protected Criteria In_filter(Object[] part_ary) {
+		int len = part_ary.length;
+		Criteria[] crt_ary = new Criteria[len];
+		String fld_ns = tbl.Fld_page_ns(); String fld_ttl = tbl.Fld_page_title();
+		for (int i = 0; i < len; i++)
+			crt_ary[i] = Criteria_.And(Db_crt_.New_eq(fld_ns, 0), Db_crt_.New_eq(fld_ttl, Bry_.Empty));
+		return Criteria_.Or_many(crt_ary);
+	}
+	@Override protected void Fill_stmt(Db_stmt stmt, int bgn, int end) {
+		for (int i = bgn; i < end; i++) {
+			Xowd_page_itm page = (Xowd_page_itm)hash.Get_at(i);
+			stmt.Crt_int(page_tbl.Fld_page_ns(), page.Ns_id());
+			stmt.Crt_bry_as_str(page_tbl.Fld_page_title(), page.Ttl_page_db());
+		}
+	}
+	@Override public Xowd_page_itm Read_data_to_page(Xowd_page_itm rdr_page) {
+		Xow_ns ns = ns_mgr.Ids_get_or_null(rdr_page.Ns_id());
+		if (ns == null) return null;	// NOTE: ns seems to "randomly" be null when threading during redlinks; guard against null; DATE:2014-01-03
+		byte[] ttl_wo_ns = rdr_page.Ttl_page_db();
+		rdr_page.Ttl_(ns, ttl_wo_ns);
+		return (Xowd_page_itm)hash.Get_by(rdr_page.Ttl_full_db());
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm_.java b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm_.java
index 49986be0f..f98b9680d 100644
--- a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm_.java
+++ b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm_.java
@@ -17,14 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.wikis.domains.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*;
 class Xow_domain_crt_itm_ {
-        public static final Xow_domain_crt_itm Null = null;
-}
-class Xow_domain_crt_itm__any_wiki implements Xow_domain_crt_itm {
-	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return true;}
-        public static final Xow_domain_crt_itm__any_wiki Instance = new Xow_domain_crt_itm__any_wiki(); Xow_domain_crt_itm__any_wiki() {}
+        public static final    Xow_domain_crt_itm Null = null;
 }
 class Xow_domain_crt_itm__in implements Xow_domain_crt_itm {
-	private final Xow_domain_crt_itm[] ary;
+	private final    Xow_domain_crt_itm[] ary;
 	public Xow_domain_crt_itm__in(Xow_domain_crt_itm[] ary) {this.ary = ary;}
 	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {
 		int len = ary.length;
@@ -49,36 +45,20 @@ class Xow_domain_crt_itm__any_standard implements Xow_domain_crt_itm {
 			default:									return false;
 		}
 	}
-        public static final Xow_domain_crt_itm__any_standard Instance = new Xow_domain_crt_itm__any_standard(); Xow_domain_crt_itm__any_standard() {}
-}
-class Xow_domain_crt_itm__none implements Xow_domain_crt_itm {
-	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return false;}
-        public static final Xow_domain_crt_itm__none Instance = new Xow_domain_crt_itm__none(); Xow_domain_crt_itm__none() {}
-}
-class Xow_domain_crt_itm__self implements Xow_domain_crt_itm {
-	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return Bry_.Eq(cur.Domain_bry(), comp.Domain_bry());}
-        public static final Xow_domain_crt_itm__self Instance = new Xow_domain_crt_itm__self(); Xow_domain_crt_itm__self() {}
-}
-class Xow_domain_crt_itm__same_lang implements Xow_domain_crt_itm {
-	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return Bry_.Eq(cur.Lang_orig_key(), comp.Lang_orig_key());}
-        public static final Xow_domain_crt_itm__same_lang Instance = new Xow_domain_crt_itm__same_lang(); Xow_domain_crt_itm__same_lang() {}
-}
-class Xow_domain_crt_itm__same_type implements Xow_domain_crt_itm {
-	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return cur.Domain_type_id() == comp.Domain_type_id();}
-        public static final Xow_domain_crt_itm__same_type Instance = new Xow_domain_crt_itm__same_type(); Xow_domain_crt_itm__same_type() {}
+        public static final    Xow_domain_crt_itm__any_standard Instance = new Xow_domain_crt_itm__any_standard(); Xow_domain_crt_itm__any_standard() {}
 }
 class Xow_domain_crt_itm__lang implements Xow_domain_crt_itm {
-	private final byte[] lang_key;
+	private final    byte[] lang_key;
 	public Xow_domain_crt_itm__lang(byte[] lang_key) {this.lang_key = lang_key;}
 	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return Bry_.Eq(comp.Lang_orig_key(), lang_key);}
 }
 class Xow_domain_crt_itm__type implements Xow_domain_crt_itm {
-	private final int wiki_tid;
+	private final    int wiki_tid;
 	public Xow_domain_crt_itm__type(int wiki_tid) {this.wiki_tid = wiki_tid;}
 	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return comp.Domain_type_id() == wiki_tid;}
 }
 class Xow_domain_crt_itm__wiki implements Xow_domain_crt_itm {
-	private final byte[] domain;
+	private final    byte[] domain;
 	public Xow_domain_crt_itm__wiki(byte[] domain) {this.domain = domain;}
 	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return Bry_.Eq(comp.Domain_bry(), domain);}
 }
diff --git a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__any_wiki.java b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__any_wiki.java
new file mode 100644
index 000000000..f026466fe
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__any_wiki.java
@@ -0,0 +1,22 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.domains.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*;
+class Xow_domain_crt_itm__any_wiki implements Xow_domain_crt_itm {
+	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return true;}
+        public static final    Xow_domain_crt_itm__any_wiki Instance = new Xow_domain_crt_itm__any_wiki(); Xow_domain_crt_itm__any_wiki() {}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__none.java b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__none.java
new file mode 100644
index 000000000..6d309fafc
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__none.java
@@ -0,0 +1,22 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.domains.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*;
+class Xow_domain_crt_itm__none implements Xow_domain_crt_itm {
+	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return false;}
+        public static final    Xow_domain_crt_itm__none Instance = new Xow_domain_crt_itm__none(); Xow_domain_crt_itm__none() {}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__same_lang.java b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__same_lang.java
new file mode 100644
index 000000000..6b76bb0f1
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__same_lang.java
@@ -0,0 +1,22 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.domains.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*;
+class Xow_domain_crt_itm__same_lang implements Xow_domain_crt_itm {
+	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return Bry_.Eq(cur.Lang_orig_key(), comp.Lang_orig_key());}
+        public static final    Xow_domain_crt_itm__same_lang Instance = new Xow_domain_crt_itm__same_lang(); Xow_domain_crt_itm__same_lang() {}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__same_type.java b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__same_type.java
new file mode 100644
index 000000000..cca284c51
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__same_type.java
@@ -0,0 +1,22 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.domains.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*;
+class Xow_domain_crt_itm__same_type implements Xow_domain_crt_itm {
+	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return cur.Domain_type_id() == comp.Domain_type_id();}
+        public static final    Xow_domain_crt_itm__same_type Instance = new Xow_domain_crt_itm__same_type(); Xow_domain_crt_itm__same_type() {}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__self.java b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__self.java
new file mode 100644
index 000000000..625e2c36d
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm__self.java
@@ -0,0 +1,22 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.wikis.domains.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*;
+class Xow_domain_crt_itm__self implements Xow_domain_crt_itm {
+	public boolean Matches(Xow_domain_itm cur, Xow_domain_itm comp) {return Bry_.Eq(cur.Domain_bry(), comp.Domain_bry());}
+        public static final    Xow_domain_crt_itm__self Instance = new Xow_domain_crt_itm__self(); Xow_domain_crt_itm__self() {}
+}
diff --git a/400_xowa/src/gplx/xowa/wikis/pages/lnkis/Xopg_redlink_mgr.java b/400_xowa/src/gplx/xowa/wikis/pages/lnkis/Xopg_redlink_mgr.java
index 9734d5758..bd50757b4 100644
--- a/400_xowa/src/gplx/xowa/wikis/pages/lnkis/Xopg_redlink_mgr.java
+++ b/400_xowa/src/gplx/xowa/wikis/pages/lnkis/Xopg_redlink_mgr.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.wikis.pages.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.pages.*;
-import gplx.xowa.files.gui.*;
+import gplx.xowa.guis.cbks.js.*;
 import gplx.xowa.wikis.data.tbls.*;
 import gplx.xowa.langs.vnts.*;
 public class Xopg_redlink_mgr implements Gfo_invk {
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_box_w_fmtr_arg.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_box_w_fmtr_arg.java
index 876b7bfb2..3a96fa30a 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_box_w_fmtr_arg.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_box_w_fmtr_arg.java
@@ -16,11 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-import gplx.langs.htmls.*; import gplx.xowa.htmls.core.makes.*;
-public interface Gallery_box_w_fmtr_arg extends gplx.core.brys.Bfr_arg {
-	Gallery_box_w_fmtr_arg Init(int uid, int width);
-}
-class Gallery_box_w_fmtr_arg__basic implements gplx.core.brys.Bfr_arg, Gallery_box_w_fmtr_arg {
+class Gallery_box_w_fmtr_arg implements gplx.core.brys.Bfr_arg {
 	private int width;
 	public Gallery_box_w_fmtr_arg Init(int uid, int width) {this.width = width; return this;}
 	public void Bfr_arg__add(Bry_bfr bfr) {
@@ -28,36 +24,5 @@ class Gallery_box_w_fmtr_arg__basic implements gplx.core.brys.Bfr_arg, Gallery_b
 		bfr.Add_int_variable(width);
 		bfr.Add(Style_end);
 	}
-	private static final byte[] Style_bgn = Bry_.new_a7("style=\"width:"), Style_end = Bry_.new_a7("px;\"");
+	private static final    byte[] Style_bgn = Bry_.new_a7("style=\"width:"), Style_end = Bry_.new_a7("px;\"");
 }
-//	class Gallery_box_w_fmtr_arg__hdump : gplx.core.brys.Bfr_arg, Gallery_box_w_fmtr_arg {
-//		private int uid;
-//		public Gallery_box_w_fmtr_arg Init(int uid, int width) {this.uid = uid; return this;}
-//		public void Bfr_arg__add(Bry_bfr bfr) {
-//			bfr.Add(Xoh_make_trie_.Bry__gallery_box_w);
-//			bfr.Add_int_variable(uid);
-//			bfr.Add_byte_apos();
-//		}
-//	}
-interface Gallery_img_pad_fmtr_arg extends gplx.core.brys.Bfr_arg {
-	Gallery_img_pad_fmtr_arg Init(int uid, int vpad);
-}
-class Gallery_img_pad_fmtr_arg__basic implements gplx.core.brys.Bfr_arg, Gallery_img_pad_fmtr_arg {
-	private int vpad;
-	public Gallery_img_pad_fmtr_arg Init(int uid, int vpad) {this.vpad = vpad; return this;}
-	public void Bfr_arg__add(Bry_bfr bfr) {
-		bfr.Add(Style_bgn);
-		bfr.Add_int_variable(vpad);
-		bfr.Add(Style_end);
-	}
-	private static final byte[] Style_bgn = Bry_.new_a7("style=\"margin:"), Style_end = Bry_.new_a7("px auto;\"");
-}
-//	class Gallery_img_pad_fmtr_arg__hdump : gplx.core.brys.Bfr_arg, Gallery_img_pad_fmtr_arg {
-//		private int uid;
-//		public Gallery_img_pad_fmtr_arg Init(int uid, int width) {this.uid = uid; return this;}
-//		public void Bfr_arg__add(Bry_bfr bfr) {
-//			bfr.Add(Xoh_make_trie_.Bry__gallery_img_pad);
-//			bfr.Add_int_variable(uid);
-//			bfr.Add_byte_apos();
-//		}
-//	}
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr.java
deleted file mode 100644
index 42766dc34..000000000
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-import gplx.core.brys.*; import gplx.core.brys.fmtrs.*;
-import gplx.xowa.files.*; import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*; import gplx.xowa.htmls.core.makes.imgs.*; import gplx.xowa.wikis.pages.*; import gplx.xowa.parsers.lnkis.*;
-import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.htmls.*;
-import gplx.xowa.parsers.*;
-public class Gallery_html_wtr {
-	private final Xoh_arg_img_core img_core_fmtr_basic = new Xoh_arg_img_core__basic(), img_core_fmtr_hdump = new Xoh_arg_img_core__hdump();
-	public void Write_html(Bry_bfr bfr, Xoae_app app, Xowe_wiki wiki, Xop_ctx ctx, Xoh_html_wtr wtr, Xoh_wtr_ctx hctx, Xoae_page page, Gallery_xnde mgr, byte[] src) {
-		int itm_div_w = Gallery_html_wtr_utl.Calc_itm_div_len(mgr.Itm_w_or_default());
-		int itm_div_h = Gallery_html_wtr_utl.Calc_itm_div_len(mgr.Itm_h_or_default());
-		int itm_box_w = Gallery_html_wtr_utl.Calc_itm_box_w(itm_div_w);
-		int itms_len = mgr.Itms_len();
-		int itms_per_row = mgr.Itms_per_row();
-		if (itms_per_row == Gallery_xnde.Null) itms_per_row = wiki.Cfg_gallery().Imgs_per_row();
-		int mgr_box_width_row = Gallery_html_wtr_utl.Calc_itm_pad_w(itm_box_w) * itms_per_row;
-		int row_multiplier; Bry_fmtr mgr_box_style;
-		if (itms_per_row == Gallery_xnde.Null) {	// no "perrow" defined; default to total # of items;
-			row_multiplier = itms_len;
-			mgr_box_style = Gallery_html_wtr_.Mgr_box_style_none;
-		}
-		else {
-			row_multiplier = itms_per_row;
-			mgr_box_style = Gallery_html_wtr_.Mgr_box_style_max;
-		}
-		boolean mode_is_packed = Gallery_mgr_base_.Mode_is_packed(mgr.Mode());
-		byte[] mgr_box_cls; int mgr_box_width_all;
-		if (mode_is_packed) {
-			mgr_box_cls = Gallery_html_wtr_.Cls_packed;
-			mgr_box_width_all = 0;
-		}
-		else {
-			mgr_box_cls = Bry_.Empty;
-			mgr_box_width_all = Gallery_html_wtr_utl.Calc_itm_pad_w(itm_box_w) * row_multiplier; // 8=Gallery Box borders; REF.MW:ImageGallery.php|GB_BORDERS;
-		}
-		Bry_bfr itm_bfr = wiki.Utl__bfr_mkr().Get_k004(), tmp_bfr = wiki.Utl__bfr_mkr().Get_k004();
-		int mgr_elem_id = -1; int gallery_w_count = 0;
-		boolean hctx_is_hdump = hctx.Mode_is_hdump();
-		Xoh_arg_img_core img_core_fmtr = hctx_is_hdump ? img_core_fmtr_hdump : img_core_fmtr_basic;
-		Xopg_hdump_data hdump_imgs = page.Hdump_data();
-		for (int i = 0; i < itms_len; i++) {
-			Gallery_itm itm = mgr.Itms_get_at(i);
-			byte[] itm_caption = Gallery_html_wtr_.Bld_caption(wiki, ctx, wtr, hctx, itm);
-			Xoa_ttl itm_ttl = itm.Ttl();
-			if (	itm_ttl != null				// ttl does not have invalid characters
-				&&	itm_ttl.Ns().Id_is_file()	// ttl is in file ns;
-				) {
-				Xop_lnki_tkn lnki = ctx.Tkn_mkr().Lnki(itm.Ttl_bgn(), itm.Ttl_end()).Ttl_(itm_ttl).W_(mgr.Itm_w()).H_(mgr.Itm_h());
-				Xof_file_itm xfer_itm = wtr.Lnki_wtr().File_wtr().Lnki_eval(Xof_exec_tid.Tid_wiki_page, ctx, page, lnki);
-				xfer_itm.Html_gallery_mgr_h_(mgr.Itm_h_or_default());
-				xfer_itm.Html_elem_tid_(Xof_html_elem.Tid_gallery);
-				if (mode_is_packed) {
-					if (gallery_w_count < itms_per_row) {
-						mgr_box_width_all += Gallery_html_wtr_utl.Calc_itm_pad_w(itm_box_w);
-						++gallery_w_count;
-					}
-					if (xfer_itm.Html_w() > 0) {
-						itm_div_w = Gallery_html_wtr_utl.Calc_itm_div_len(xfer_itm.Html_w());
-						itm_box_w = Gallery_html_wtr_utl.Calc_itm_box_w(itm_div_w);	// NOTE: redefine itm_box_w for rest of loop
-					}
-					if (xfer_itm.Html_h() > 0)
-						itm_div_h = Gallery_html_wtr_utl.Calc_itm_div_len(xfer_itm.Html_h());
-				}
-				int itm_elem_id = xfer_itm.Html_uid();
-				if (mgr_elem_id == -1)
-					mgr_elem_id = itm_elem_id;	// HACK: set mgr_elem_id to first itm_elem_id
-				int html_w = xfer_itm.Html_w();
-				int html_h = xfer_itm.Html_h();
-				byte[] html_src = xfer_itm.Html_view_url().To_http_file_bry();
-				if (html_src.length == 0) {	// itm not found; use gallery defaults
-					html_w = mgr.Itm_w_or_default();
-					html_h = mgr.Itm_h_or_default();
-				}
-				byte[] lnki_ttl = lnki.Ttl().Page_txt();
-				Xoa_ttl lnki_link_ttl = itm_ttl;					// default href to ttl
-				if (	itm.Link_bgn() != Bry_find_.Not_found		// link is not -1; EX: "A.png" has no link specified
-					&&	(itm.Link_end() - itm.Link_bgn()) > 0		// and link_end - link_bgn > 0; EX: "A.png|link="; DATE:2014-06-15
-					)
-					lnki_link_ttl = Xoa_ttl.parse(wiki, Bry_.Mid(src, itm.Link_bgn(), itm.Link_end()));
-				byte[] lnki_href = app.Html__href_wtr().Build_to_bry(wiki, lnki_link_ttl);
-				byte[] lnki_alt = itm.Alt_bgn() == Bry_find_.Not_found ? lnki_ttl : Xoh_html_wtr_escaper.Escape(app.Parser_amp_mgr(), tmp_bfr, Bry_.Mid(src, itm.Alt_bgn(), itm.Alt_end())); 
-				img_core_fmtr.Init(itm_elem_id, html_src, html_w, html_h);
-				int itm_margin = Gallery_html_wtr_utl.Calc_vpad(mgr.Itm_h(), html_h);
-				Gallery_html_wtr_.Itm_img_fmtr.Bld_bfr_many(itm_bfr
-					, itm_box_w, itm_div_w, itm_margin
-					, itm_elem_id
-					, lnki_ttl
-					, lnki_href
-					, img_core_fmtr
-					, itm_caption
-					, lnki_alt
-					);
-				if (hctx_is_hdump)
-					hdump_imgs.Imgs_add_img(new Xohd_img_itm__gallery_itm().Data_init_gallery(itm_div_w, itm_box_w, itm_margin), xfer_itm, Xohd_img_itm__gallery_itm.Tid_gallery);
-			}
-			else {
-				Gallery_html_wtr_.Itm_txt_fmtr.Bld_bfr_many(itm_bfr
-					, itm_box_w, itm_div_h
-					, Bry_.Mid(src, itm.Ttl_bgn(), itm.Ttl_end())
-					, itm_caption
-					);
-			}
-		}
-		byte[] ul_id_atr = Gallery_html_wtr_.Bld_id_atr(tmp_bfr, hctx_is_hdump, Gallery_html_wtr_.Bld_id(tmp_bfr, Gallery_html_wtr_.Id__ul, mgr_elem_id));
-		itm_bfr.Mkr_rls();
-		tmp_bfr.Mkr_rls();
-		int mgr_box_width_max = mgr_box_width_all < mgr_box_width_row ? mgr_box_width_row : mgr_box_width_all;
-		Gallery_html_wtr_.Fmtr__ul__nde.Bld_bfr_many(bfr, ul_id_atr, mgr_box_cls, Bfr_arg_.New_bry_fmtr(mgr_box_style, Bfr_arg_.New_int(mgr_box_width_max)), itm_bfr);
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Xoh_cfg_gallery.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_img_pad_fmtr_arg.java
similarity index 61%
rename from 400_xowa/src/gplx/xowa/xtns/gallery/Xoh_cfg_gallery.java
rename to 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_img_pad_fmtr_arg.java
index 2a7b3d9f7..b9b3aff89 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Xoh_cfg_gallery.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_img_pad_fmtr_arg.java
@@ -16,11 +16,13 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-public class Xoh_cfg_gallery implements Gfo_invk {
-	public int Imgs_per_row() {return imgs_per_row;} public Xoh_cfg_gallery Imgs_per_row_(int v) {imgs_per_row = v; return this;} private int imgs_per_row = 8;	// changed from 4 to 8; DATE:2014-02-04
-	public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
-		if		(ctx.Match(k, Invk_imgs_per_row_))		imgs_per_row = m.ReadInt("v");
-		else	return Gfo_invk_.Rv_unhandled;
-		return this;
-	}	private static final String Invk_imgs_per_row_ = "imgs_per_row_";
+class Gallery_img_pad_fmtr_arg implements gplx.core.brys.Bfr_arg {
+	private int vpad;
+	public Gallery_img_pad_fmtr_arg Init(int uid, int vpad) {this.vpad = vpad; return this;}
+	public void Bfr_arg__add(Bry_bfr bfr) {
+		bfr.Add(Style_bgn);
+		bfr.Add_int_variable(vpad);
+		bfr.Add(Style_end);
+	}
+	private static final    byte[] Style_bgn = Bry_.new_a7("style=\"margin:"), Style_end = Bry_.new_a7("px auto;\"");
 }
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm.java
index 188b0ffb9..b716e7b15 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm.java
@@ -16,23 +16,23 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-import gplx.xowa.files.*; import gplx.xowa.files.gui.*; import gplx.xowa.guis.views.*; import gplx.xowa.htmls.core.htmls.*;
+import gplx.xowa.files.*; import gplx.xowa.guis.cbks.js.*; import gplx.xowa.htmls.core.htmls.*;
 import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*;
 public class Gallery_itm implements Js_img_wkr {
 	private Gallery_xnde xnde; private Xof_file_itm xfer_itm; private Xowe_wiki wiki; private Xop_ctx ctx; private byte[] src; private byte[] gallery_li_id_bry; private int gallery_itm_idx;
-	public Xoa_ttl Ttl() {return ttl;} public Gallery_itm Ttl_(Xoa_ttl v) {ttl = v; return this;} private Xoa_ttl ttl;
-	public int Ttl_bgn() {return ttl_bgn;} public Gallery_itm Ttl_bgn_(int v) {ttl_bgn = v; return this;} private int ttl_bgn;
-	public int Ttl_end() {return ttl_end;} public Gallery_itm Ttl_end_(int v) {ttl_end = v; return this;} private int ttl_end;
-	public Xof_ext Ext() {return ext;} public Gallery_itm Ext_(Xof_ext v) {ext = v; return this;} private Xof_ext ext;
-	public byte[] Caption_bry() {return caption_bry;} public Gallery_itm Caption_bry_(byte[] v) {caption_bry = v; return this;} private byte[] caption_bry;
-	public Xop_root_tkn Caption_tkn() {return caption_tkn;} public Gallery_itm Caption_tkn_(Xop_root_tkn v) {caption_tkn = v; return this;} private Xop_root_tkn caption_tkn;
-	public int Alt_bgn() {return alt_bgn;} public Gallery_itm Alt_bgn_(int v) {alt_bgn = v; return this;} private int alt_bgn;
-	public int Alt_end() {return alt_end;} public Gallery_itm Alt_end_(int v) {alt_end = v; return this;} private int alt_end;
-	public int Link_bgn() {return link_bgn;} public Gallery_itm Link_bgn_(int v) {link_bgn = v; return this;} private int link_bgn;
-	public int Link_end() {return link_end;} public Gallery_itm Link_end_(int v) {link_end = v; return this;} private int link_end;
-	public int Page_bgn() {return page_bgn;} public Gallery_itm Page_bgn_(int v) {page_bgn = v; return this;} private int page_bgn;
-	public int Page_end() {return page_end;} public Gallery_itm Page_end_(int v) {page_end = v; return this;} private int page_end;
-	public Xop_lnki_tkn Lnki_tkn() {return lnki_tkn;} public Gallery_itm Lnki_tkn_(Xop_lnki_tkn v) {lnki_tkn = v; return this;} private Xop_lnki_tkn lnki_tkn;
+	public Xoa_ttl			Ttl() {return ttl;} public Gallery_itm Ttl_(Xoa_ttl v) {ttl = v; return this;} private Xoa_ttl ttl;
+	public int				Ttl_bgn() {return ttl_bgn;} public Gallery_itm Ttl_bgn_(int v) {ttl_bgn = v; return this;} private int ttl_bgn;
+	public int				Ttl_end() {return ttl_end;} public Gallery_itm Ttl_end_(int v) {ttl_end = v; return this;} private int ttl_end;
+	public Xof_ext			Ext() {return ext;} public Gallery_itm Ext_(Xof_ext v) {ext = v; return this;} private Xof_ext ext;
+	public byte[]			Caption_bry() {return caption_bry;} public Gallery_itm Caption_bry_(byte[] v) {caption_bry = v; return this;} private byte[] caption_bry;
+	public Xop_root_tkn		Caption_tkn() {return caption_tkn;} public Gallery_itm Caption_tkn_(Xop_root_tkn v) {caption_tkn = v; return this;} private Xop_root_tkn caption_tkn;
+	public int				Alt_bgn() {return alt_bgn;} public Gallery_itm Alt_bgn_(int v) {alt_bgn = v; return this;} private int alt_bgn;
+	public int				Alt_end() {return alt_end;} public Gallery_itm Alt_end_(int v) {alt_end = v; return this;} private int alt_end;
+	public int				Link_bgn() {return link_bgn;} public Gallery_itm Link_bgn_(int v) {link_bgn = v; return this;} private int link_bgn;
+	public int				Link_end() {return link_end;} public Gallery_itm Link_end_(int v) {link_end = v; return this;} private int link_end;
+	public int				Page_bgn() {return page_bgn;} public Gallery_itm Page_bgn_(int v) {page_bgn = v; return this;} private int page_bgn;
+	public int				Page_end() {return page_end;} public Gallery_itm Page_end_(int v) {page_end = v; return this;} private int page_end;
+	public Xop_lnki_tkn		Lnki_tkn() {return lnki_tkn;} public Gallery_itm Lnki_tkn_(Xop_lnki_tkn v) {lnki_tkn = v; return this;} private Xop_lnki_tkn lnki_tkn;
 	public Gallery_itm Reset() {
 		ttl = null;
 		ttl_bgn = ttl_end = alt_bgn = alt_end = link_bgn = link_end = page_bgn = page_end = Bry_find_.Not_found;
@@ -41,16 +41,17 @@ public class Gallery_itm implements Js_img_wkr {
 		ext = null;
 		return this;
 	}
+
 	public void Html_prepare(Xowe_wiki wiki, Xop_ctx ctx, byte[] src, Gallery_xnde xnde, Xof_file_itm xfer_itm, byte[] gallery_li_id_bry, int gallery_itm_idx) {
 		this.xnde = xnde; this.xfer_itm = xfer_itm;
 		this.wiki = wiki; this.ctx = ctx; this.src = src; this.gallery_li_id_bry = gallery_li_id_bry; this.gallery_itm_idx = gallery_itm_idx;
 	}
-	public void Js_wkr__update_hdoc(Xoa_page page, Xog_js_wkr js_wkr, int html_uid, int html_w, int html_h, Io_url html_view_url, int orig_w, int orig_h, Io_url html_orig_url, byte[] lnki_ttl) {
+	public void Js_wkr__update_hdoc(Xoa_page page, Xog_js_wkr js_wkr, int html_uid, int html_w, int html_h, Io_url html_view_url, int orig_w, int orig_h, Xof_ext orig_ext, Io_url html_orig_url, byte[] lnki_ttl) {
 		Gallery_mgr_base gallery_mgr = xnde.Gallery_mgr();
 		Bry_bfr bfr = wiki.Utl__bfr_mkr().Get_k004(), tmp_bfr = wiki.Utl__bfr_mkr().Get_k004();
 		try {
 			xfer_itm.Init_at_gallery_end(html_w, html_h, html_view_url, html_orig_url);
-			gallery_mgr.Write_html_itm(bfr, tmp_bfr, wiki.Appe(), wiki, ctx.Page(), ctx, wiki.Html_mgr().Html_wtr(), Xoh_wtr_ctx.Basic, src, xnde, Bry_.Empty, gallery_itm_idx, xfer_itm, false);
+			Gallery_mgr_wtr.Write_itm(bfr, tmp_bfr, wiki.Appe(), wiki, ctx.Page(), ctx, wiki.Html_mgr().Html_wtr(), Xoh_wtr_ctx.Basic, src, gallery_mgr, xnde, gallery_itm_idx, xfer_itm);
 			String itm_html = bfr.To_str_and_clear();
 			js_wkr.Html_elem_replace_html(String_.new_u8(gallery_li_id_bry), itm_html);
 			if (gallery_itm_idx == xnde.Itms_len() - 1 && Gallery_mgr_base_.Mode_is_packed(xnde.Mode()))
@@ -60,4 +61,21 @@ public class Gallery_itm implements Js_img_wkr {
 			bfr.Mkr_rls(); tmp_bfr.Mkr_rls();
 		}
 	}
+//		public static void Js_wkr__update_hdoc2(Xoa_page page, Xog_js_wkr js_wkr, int html_uid, int html_w, int html_h, Io_url html_view_url, int orig_w, int orig_h, Io_url html_orig_url, byte[] lnki_ttl) {
+//			Xow_wiki wiki = null;			
+//			Gallery_mgr_base gallery_mgr = null;
+//			Bry_bfr bfr = null, tmp_bfr = null;
+//			Xof_file_itm xfer_itm = null;
+//			try {
+//				xfer_itm.Init_at_gallery_end(html_w, html_h, html_view_url, html_orig_url);
+////				Gallery_mgr_wtr.Write_itm(bfr, tmp_bfr, wiki.Appe(), wiki, ctx.Page(), ctx, wiki.Html_mgr().Html_wtr(), Xoh_wtr_ctx.Basic, src, gallery_mgr, xnde, gallery_itm_idx, xfer_itm);
+////				String itm_html = bfr.To_str_and_clear();
+////				js_wkr.Html_elem_replace_html(String_.new_u8(gallery_li_id_bry), itm_html);
+////				if (gallery_itm_idx == xnde.Itms_len() - 1 && Gallery_mgr_base_.Mode_is_packed(xnde.Mode()))
+////					page.Xtn_gallery_packed_exists_y_();	// set flag for packed_gallery; don't fire multiple times; PAGE:en.w:National_Sculpture_Museum_(Valladolid); DATE:2014-07-21
+//			}
+//			finally {
+//				bfr.Mkr_rls(); tmp_bfr.Mkr_rls();
+//			}
+//		}
 }
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base.java
index fe36daba8..1fbcc5ec4 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base.java
@@ -16,197 +16,51 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-import gplx.core.brys.fmtrs.*;
-import gplx.langs.htmls.*; import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.htmls.modules.*; import gplx.xowa.files.*; import gplx.xowa.htmls.core.makes.*; import gplx.xowa.htmls.core.makes.imgs.*;
-import gplx.xowa.parsers.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.htmls.*; import gplx.xowa.parsers.lnkis.*;
+import gplx.xowa.files.*;
+import gplx.xowa.parsers.lnkis.*;
 public abstract class Gallery_mgr_base {
-	private Gallery_box_w_fmtr_arg__basic box_w_fmtr__basic = new Gallery_box_w_fmtr_arg__basic(); // private Gallery_box_w_fmtr_arg__hdump box_w_fmtr__hdump = new Gallery_box_w_fmtr_arg__hdump();
-	private Gallery_img_pad_fmtr_arg__basic img_pad_fmtr__basic = new Gallery_img_pad_fmtr_arg__basic(); // private Gallery_img_pad_fmtr_arg__hdump img_pad_fmtr__hdump = new Gallery_img_pad_fmtr_arg__hdump();
-	public abstract byte Tid();
-	public abstract byte[] Tid_bry();
-	@gplx.Virtual public boolean Tid_is_packed() {return false;}
-	public int Itm_default_w() {return itm_default_w;} protected int itm_default_w;
-	public int Itm_default_h() {return itm_default_h;} protected int itm_default_h;
-	public int Itms_per_row() {return itms_per_row;} @gplx.Virtual public void Itms_per_row_(int v) {this.itms_per_row = v;} protected int itms_per_row;		
-	@gplx.Virtual public int Get_thumb_padding() {return 30;}	// REF.MW: getThumbPadding; How much padding such the thumb have between image and inner div that that contains the border. This is both for verical and horizontal padding. (However, it is cut in half in the vertical direction).
-	@gplx.Virtual public int Get_gb_padding() {return 5;}	// REF.MW: getGBPadding; GB stands for gallerybox (as in the <li class="gallerybox"> element)
-	@gplx.Virtual public int Get_gb_borders() {return 8;}	// REF.MW: getGBBorders; Get how much extra space the borders around the image takes up. For this mode, it is 2px borders on each side + 2px implied padding on each side from the stylesheet, giving us 2*2+2*2 = 8.
-	@gplx.Virtual public int Get_all_padding() {return this.Get_thumb_padding() + this.Get_gb_padding() + this.Get_gb_borders();} // REF.MW: getAllPadding; How many pixels of whitespace surround the thumbnail.
-	@gplx.Virtual public int Get_vpad(int itm_h, int thm_h) {	// REF.MW: getVPad; Get vertical padding for a thumbnail; Generally this is the total height minus how high the thumb is.
-		if (thm_h == -1) thm_h = itm_h; // NOTE: thm_h will be -1 on 1st pass; set to dflt_h, else will end up with 115px for hdump; PAGE:en.w:National_Gallery_of_Art  DATE:2016-06-19
-		return (this.Get_thumb_padding() + itm_h - thm_h) / 2;
-	}
-	@gplx.Virtual public int Get_thumb_div_width(int thm_w) {	// REF.MW: getThumbDivWidth; Get the width of the inner div that contains the thumbnail in question. This is the div with the class of "thumb".
-		return itm_default_w + this.Get_thumb_padding();
-	}
-	@gplx.Virtual public int Get_gb_width(int thm_w, int thm_h) {// REF.MW: getGBWidth; Width of gallerybox <li>. Generally is the width of the image, plus padding on image plus padding on gallerybox.s
+	public abstract byte	Tid();
+	public int				Itm_default_w() {return itm_default_w;} protected int itm_default_w;
+	public int				Itm_default_h() {return itm_default_h;} protected int itm_default_h;
+	public int				Itms_per_row()	{return itms_per_row;} protected int itms_per_row;
+	@gplx.Virtual public int		Get_all_padding() {return this.Get_thumb_padding() + this.Get_gb_padding() + this.Get_gb_borders();} // REF.MW: getAllPadding; How many pixels of whitespace surround the thumbnail.
+	@gplx.Virtual public int		Get_gb_padding() {return 5;}		// REF.MW: getGBPadding; GB stands for gallerybox (as in the <li class="gallerybox"> element)
+	@gplx.Virtual public int		Get_gb_borders() {return 8;}		// REF.MW: getGBBorders; Get how much extra space the borders around the image takes up. For this mode, it is 2px borders on each side + 2px implied padding on each side from the stylesheet, giving us 2*2+2*2 = 8.
+	@gplx.Virtual public int		Get_gb_width(int thm_w, int thm_h) {// REF.MW: getGBWidth; Width of gallerybox <li>. Generally is the width of the image, plus padding on image plus padding on gallerybox.s
 		return itm_default_w + this.Get_thumb_padding() + this.Get_gb_padding();
 	}
-	@gplx.Virtual public void Get_modules(Xoae_page page) {		// REF.MW: getModules; Get a list of modules to include in the page.
-		page.Html_data().Head_mgr().Itm__gallery_styles().Enabled_y_();	// enable styles or some galleries will show up as list items; PAGE:s.w:Gothic_architecture DATE:2015-11-06
+	@gplx.Virtual public int		Get_vpad(int xnde_h, int html_h) {	// REF.MW: getVPad; Get vertical padding for a thumbnail; Generally this is the total height minus how high the thumb is.
+		if (html_h == -1) html_h = xnde_h; // NOTE: html_h will be -1 on 1st pass; set to dflt_h, else will end up with 115px for hdump; PAGE:en.w:National_Gallery_of_Art  DATE:2016-06-19
+		return (this.Get_thumb_padding() + xnde_h - html_h) / 2;
 	}
-	@gplx.Virtual public void Init(int itms_per_row, int itm_default_w, int itm_default_h) {
-		this.itms_per_row = itms_per_row;
-		this.itm_default_w = itm_default_w;
-		this.itm_default_h = itm_default_h;
+	@gplx.Virtual public int		Get_thumb_padding() {return 30;}	// REF.MW: getThumbPadding; How much padding such the thumb have between image and inner div that that contains the border. This is both for verical and horizontal padding. (However, it is cut in half in the vertical direction).
+	@gplx.Virtual public int Get_thumb_div_width(int thm_w) {			// REF.MW: getThumbDivWidth; Get the width of the inner div that contains the thumbnail in question. This is the div with the class of "thumb".
+		return itm_default_w + this.Get_thumb_padding();
 	}
-	@gplx.Virtual public void Wrap_gallery_text(Bry_bfr bfr, byte[] gallery_text, int thm_w, int thm_h) {
-		bfr	.Add(Wrap_gallery_text_bgn)
-			.Add(gallery_text)
-			.Add(Wrap_gallery_text_end)
-			;
-	}
-	public void Write_html(Bry_bfr bfr, Xowe_wiki wiki, Xoae_page page, Xop_ctx ctx, Xoh_wtr_ctx hctx, byte[] src, Gallery_xnde xnde) {
-		boolean hctx_is_hdump = hctx.Mode_is_hdump();
-		Bry_bfr tmp_bfr = wiki.Utl__bfr_mkr().Get_b512();			
-		byte[] box_style = xnde.Atr_style();
-		int gallery_uid = page.Html_data().Xtn_gallery_next_id();
-		if (itms_per_row > 0) {
-			int max_width = itms_per_row * (itm_default_w + this.Get_all_padding());
-			box_style = Fmt_and_add(tmp_bfr, Gallery_html_wtr_.Fmtr__ul__style, box_style, max_width);
-			page.Hdump_data().Imgs_add(new Xohd_img_itm__gallery_mgr(gallery_uid, max_width));
-		}
-		byte[] box_cls = Fmt_and_add(tmp_bfr, Gallery_html_wtr_.Fmtr__ul__cls, xnde.Atr_cls(), this.Tid_bry());
-		byte[] gallery_ul_id = tmp_bfr.Add(Gallery_html_wtr_.Id__ul).Add_int_variable(gallery_uid).To_bry_and_clear();
-		Box_hdr_write(bfr, wiki.Appe().Html_mgr().Whitelist_mgr(), src, gallery_ul_id, box_cls, box_style, xnde.Atrs_other(), hctx_is_hdump, gallery_uid);
-		byte[] box_caption = xnde.Atr_caption();
-		if (Bry_.Len_gt_0(box_caption)) Gallery_html_wtr_.Fmtr__li__txt.Bld_bfr_many(bfr, box_caption);
-
-		Xoae_app app = wiki.Appe(); Xoh_html_wtr html_wtr = wiki.Html_mgr().Html_wtr();
-		int itm_len = xnde.Itms_len();
-		for (int i = 0; i < itm_len; i++) {
-			Write_html_itm(bfr, tmp_bfr, app, wiki, page, ctx, html_wtr, hctx, src, xnde, gallery_ul_id, i, null, hctx_is_hdump);
-		}
-		bfr.Add(box_html_end_bry);
-		tmp_bfr.Mkr_rls();
-	}
-	public static byte File_found_mode = Bool_.__byte;
-	public void Write_html_itm(Bry_bfr bfr, Bry_bfr tmp_bfr, Xoae_app app, Xowe_wiki wiki, Xoae_page page, Xop_ctx ctx, Xoh_html_wtr html_wtr, Xoh_wtr_ctx hctx, byte[] src, Gallery_xnde xnde, byte[] gallery_ul_id, int i, Xof_file_itm xfer_itm, boolean hctx_is_hdump) {
-		Gallery_itm itm = (Gallery_itm)xnde.Itms_get_at(i);
-		Xoa_ttl ttl = itm.Ttl(); if (Bry_.Len_eq_0(ttl.Page_db())) return;	// if file ttl is invalid, do not write; EX:File:#A.png; DATE:2016-01-12
-		byte[] itm_caption = itm.Caption_bry(); if (itm_caption == null) itm_caption = Bry_.Empty;
-		Xop_lnki_tkn lnki = itm.Lnki_tkn();
-		int lnki_w_orig = lnki.W(), lnki_h_orig = lnki.H(); // store orig lnki_w / lnki_w
-		this.Get_thumb_size(lnki, itm.Ext());	// packed=expand by 1.5;
-		if (xfer_itm == null) {	// will be null on 1st pass
-			xfer_itm = html_wtr.Lnki_wtr().File_wtr().Lnki_eval(Xof_exec_tid.Tid_wiki_page, ctx, page, lnki);
-			xfer_itm.Html_gallery_mgr_h_(xnde.Itm_h_or_default());
-			xfer_itm.Html_elem_tid_(Xof_html_elem.Tid_gallery_v2);
-		}
-		int img_uid = xfer_itm.Html_uid();
-		byte[] li_id = Gallery_html_wtr_.Bld_id(tmp_bfr, Gallery_html_wtr_.Id__li, img_uid);
-		byte[] li_id_atr = Gallery_html_wtr_.Bld_id_atr(tmp_bfr, hctx_is_hdump, li_id);
-		byte[] itm_html = Bry_.Empty;
-		int html_w_expand = xfer_itm.Html_w();
-		int html_h_expand = xfer_itm.Html_h();
-		boolean file_found = xfer_itm.File_exists();
-		if (File_found_mode != Bool_.__byte)
-			file_found = File_found_mode == Bool_.Y_byte;
-		int vpad = -1, img_div_w = -1;
-		if (	!hctx_is_hdump				// always write img if hdump; DATE:2015-04-27
-			&&	(	!ttl.Ns().Id_is_file()
-				||	!file_found
-				)
-			) {	// itm is not a file, or is not found; write text
-			itm_html = Gallery_html_wtr_.Fmtr__div1__missing.Bld_bry_many(tmp_bfr, this.Get_thumb_padding() + itm_default_h, ttl.Page_txt());
-			itm.Html_prepare(wiki, ctx, src, xnde, xfer_itm, li_id, i);
-			xfer_itm.Html_img_wkr_(itm);
-			lnki.W_(lnki_w_orig).H_(lnki_h_orig);
-			html_w_expand = lnki_w_orig; html_h_expand = lnki_h_orig;	// reset lnki_w_orig / lnki_h_orig else large captions
-		}
-		else {
-			byte[] alt = itm.Alt_bgn() == Bry_find_.Not_found && Bry_.Len_eq_0(itm_caption)	//	if ( $alt == '' && $text == '' )  $imageParameters['alt'] = $nt->getText();
-				? itm.Ttl().Page_txt()
-				: Bry_.Mid(src, itm.Alt_bgn(), itm.Alt_end());
-			alt = Xoh_html_wtr_escaper.Escape(app.Parser_amp_mgr(), tmp_bfr, alt);	// NOTE: need to handle situations wherein alt has quotes; EX:File:A"b.png; PAGE:en.w:Alexandria,_Romania DATE:2015-12-27
-			Xoa_ttl href_ttl = itm.Link_bgn() == Bry_find_.Not_found
-				? ttl
-				: Xoa_ttl.parse(wiki, Bry_.Mid(src, itm.Link_bgn(), itm.Link_end()))
-				;
-			if (href_ttl == null) href_ttl = ttl;	// occurs when link is invalid; EX: A.png|link=<invalid>
-			this.Adjust_image_parameters(xfer_itm);	// trad=noop; packed=reduce by 1.5
-			int html_w_normal = xfer_itm.Html_w();
-			int html_h_normal = xfer_itm.Html_h();
-			xfer_itm.Init_at_gallery_bgn(html_w_normal, html_h_normal, html_w_expand);// NOTE: file_w should be set to expanded width so js can resize if gallery
-			img_div_w = this.Get_thumb_div_width(html_w_expand);
-			Gallery_html_wtr_.Fmtr__div1__img.Bld_bfr_many(tmp_bfr, img_div_w);
-			// Gallery_img_pad_fmtr_arg vpad_fmtr = hctx_is_hdump ? (Gallery_img_pad_fmtr_arg)img_pad_fmtr__hdump : (Gallery_img_pad_fmtr_arg)img_pad_fmtr__basic;
-			Gallery_img_pad_fmtr_arg vpad_fmtr = img_pad_fmtr__basic;
-			vpad = this.Get_vpad(itm_default_h, html_h_expand);
-			Gallery_html_wtr_.itm_div1_fmtr.Bld_bfr_many(tmp_bfr, vpad_fmtr.Init(img_uid, vpad));	// <div style="margin:~{vpad}px auto;">
-			wiki.Html_mgr().Html_wtr().Lnki_wtr().Write_file(tmp_bfr, ctx, hctx, src, lnki, xfer_itm, alt);
-			tmp_bfr.Add(itm_divs_end_bry);
-			itm_html = tmp_bfr.To_bry_and_clear();
-		}
-		byte[] show_filenames_link = Bry_.Empty;
-		if (xnde.Show_filename()) {
-			wiki.Html_mgr().Html_wtr().Lnki_wtr().Write_plain_by_bry
-			( tmp_bfr, src, lnki
-			, Bry_.Limit(ttl.Page_txt(), 25)		// 25 is defined by captionLength in DefaultSettings.php					
-			);										// MW:passes know,noclasses which isn't relevant to XO
-		}
-		int itm_div_width = this.Get_gb_width(html_w_expand, html_h_expand);
-		// Gallery_box_w_fmtr_arg box_w_fmtr_arg = hctx_is_hdump ? (Gallery_box_w_fmtr_arg)box_w_fmtr__hdump : (Gallery_box_w_fmtr_arg)box_w_fmtr__basic;
-		Gallery_box_w_fmtr_arg box_w_fmtr_arg = box_w_fmtr__basic;
-		Gallery_html_wtr_.Fmtr__li__img.Bld_bfr_many(bfr, li_id_atr, box_w_fmtr_arg.Init(img_uid, itm_div_width));
-		bfr.Add(itm_html);
-		wiki.Parser_mgr().Main().Parse_text_to_html(tmp_bfr, page, hctx, true, itm_caption);
-		itm_caption = tmp_bfr.To_bry_and_clear();
-		itm_caption = tmp_bfr.Add(show_filenames_link).Add(itm_caption).To_bry_and_clear();
-		Wrap_gallery_text(bfr, itm_caption, html_w_expand, html_h_expand);
-		bfr.Add(itm_li_end_bry);
-		if (hctx_is_hdump)
-			page.Hdump_data().Imgs_add_img(new Xohd_img_itm__gallery_itm().Data_init_gallery(itm_div_width, img_div_w, vpad), xfer_itm, Xohd_img_itm__gallery_itm.Tid_gallery);
-	}
-	private static final    byte[] 
-	  Wrap_gallery_text_bgn = Bry_.new_a7("\n      <div class=\"gallerytext\">") // NOTE: The newline after <div class="gallerytext"> is needed to accommodate htmltidy
-	, Wrap_gallery_text_end = Bry_.new_a7("\n      </div>")	// NOTE: prepend "\n"; will cause extra \n when caption exists, but needed when caption doesn't exists; EX: "<div class='caption'>    </div>"; \n puts
-	;
 	@gplx.Virtual public void Get_thumb_size(Xop_lnki_tkn lnki, Xof_ext ext) { // REF.MW: getThumbParams; Get the transform parameters for a thumbnail.
 		lnki.W_(itm_default_w);
 		lnki.H_(itm_default_h);
 	}
-	@gplx.Virtual public void Adjust_image_parameters(Xof_file_itm xfer_itm) {}	// REF.MW: Adjust the image parameters for a thumbnail. Used by a subclass to insert extra high resolution images.		
-	private static final    byte[] 
-	  itm_li_end_bry	= Bry_.new_a7		  ( "\n    </div>"
-											  + "\n  </li>")
-	, box_html_end_bry	= Bry_.new_a7		  ( "\n</ul>")
-	, itm_divs_end_bry	= Bry_.new_a7		  ( "\n        </div>\n      </div>")
-	;
-	private static byte[] Fmt_and_add(Bry_bfr tmp_bfr, Bry_fmtr fmtr, byte[] trailer, Object... fmtr_args) {
-		fmtr.Bld_bfr_many(tmp_bfr, fmtr_args);
-		if (Bry_.Len_gt_0(trailer)) {
-			tmp_bfr.Add_byte_space();
-			tmp_bfr.Add(trailer);
-		}
-		return tmp_bfr.To_bry_and_clear();
+	@gplx.Virtual public void Get_modules(Xoae_page page) {			// REF.MW: getModules; Get a list of modules to include in the page.
+		page.Html_data().Head_mgr().Itm__gallery_styles().Enabled_y_();	// enable styles or some galleries will show up as list items; PAGE:s.w:Gothic_architecture DATE:2015-11-06
 	}
-	private static void Box_hdr_write(Bry_bfr bfr, Xop_xatr_whitelist_mgr whitelist_mgr, byte[] src, byte[] gallery_ul_uid, byte[] cls, byte[] style, List_adp xatr_list, boolean hctx_is_hdump, int uid) {
-		bfr.Add_byte(Byte_ascii.Lt).Add(Gfh_tag_.Bry__ul);
-		if (!hctx_is_hdump)
-			Gfh_wtr.Write_atr_bry(bfr, Gfh_atr_.Bry__id, gallery_ul_uid);
-		Gfh_wtr.Write_atr_bry(bfr, Gfh_atr_.Bry__class, cls);
-		Gfh_wtr.Write_atr_bry(bfr, Gfh_atr_.Bry__style, style);
-		if (xatr_list != null) {
-			int len = xatr_list.Count();
-			for (int i = 0; i < len; i++) {
-				Mwh_atr_itm xatr = (Mwh_atr_itm)xatr_list.Get_at(i);
-				if (!whitelist_mgr.Chk(Xop_xnde_tag_.Tid__ul, src, xatr)) continue;
-				byte[] key = xatr.Key_bry();
-				byte[] val = xatr.Val_as_bry();
-				Gfh_wtr.Write_atr_bry(bfr, key, val);
-			}
-		}
-		bfr.Add_byte(Byte_ascii.Gt);
+	@gplx.Virtual public void Init(int itm_default_w, int itm_default_h, int itms_per_row) {
+		this.itm_default_w = itm_default_w;
+		this.itm_default_h = itm_default_h;
+		this.itms_per_row = itms_per_row;
+	}
+	@gplx.Virtual public void Adjust_image_parameters(Xof_file_itm xfer_itm) {}	// REF.MW: Adjust the image parameters for a thumbnail. Used by a subclass to insert extra high resolution images.		
+	@gplx.Virtual public void Wrap_gallery_text(Bry_bfr bfr, byte[] gallery_text, int thm_w, int thm_h) {
+		bfr	.Add_str_a7("\n      <div class=\"gallerytext\">")	// NOTE: The newline after <div class="gallerytext"> is needed to accommodate htmltidy
+			.Add(gallery_text)
+			.Add_str_a7("\n      </div>");						// NOTE: prepend "\n"; will cause extra \n when caption exists, but needed when caption doesn't exists; EX: "<div class='caption'>    </div>"; \n puts
 	}
 }
 class Gallery_mgr_traditional extends Gallery_mgr_base {
-	@Override public byte Tid() {return Gallery_mgr_base_.Traditional_tid;}		
-	@Override public byte[] Tid_bry() {return Gallery_mgr_base_.Traditional_bry;}
+	@Override public byte	Tid()		{return Gallery_mgr_base_.Tid__traditional;}		
 }
 class Gallery_mgr_nolines extends Gallery_mgr_base {
-	@Override public byte Tid() {return Gallery_mgr_base_.Nolines_tid;}
-	@Override public byte[] Tid_bry() {return Gallery_mgr_base_.Nolines_bry;}
+	@Override public byte	Tid()		{return Gallery_mgr_base_.Tid__nolines;}
 	@Override public int Get_thumb_padding()				{return 0;}
 	@Override public int Get_gb_padding()				{return 4;} // This accounts for extra space between <li> elements.
 	@Override public int Get_vpad(int itm_h, int thm_h)	{return 0;}
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_.java
index b1f4cae9f..50d387481 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_.java
@@ -16,59 +16,60 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-import gplx.core.primitives.*;
 public class Gallery_mgr_base_ {
-	public static byte Get_or_traditional(byte[] bry) {
-		Byte_obj_val rv = (Byte_obj_val)Hash.Get_by(bry);
-		return rv == null ? Traditional_tid : rv.Val();
+	public static final byte
+	  Tid__traditional		= 0
+	, Tid__nolines			= 1
+	, Tid__packed			= 2
+	, Tid__packed__hover	= 3
+	, Tid__packed__overlay	= 4
+	;
+	private static final    byte[]
+	  Bry__traditional		= Bry_.new_a7("traditional")
+	, Bry__nolines			= Bry_.new_a7("nolines")
+	, Bry__packed			= Bry_.new_a7("packed")
+	, Bry__packed__hover	= Bry_.new_a7("packed-hover")
+	, Bry__packed__overlay	= Bry_.new_a7("packed-overlay")
+	;
+	private static final    Hash_adp_bry bry_hash = Hash_adp_bry.ci_a7()
+	.Add_bry_byte(Bry__traditional		, Tid__traditional)
+	.Add_bry_byte(Bry__nolines			, Tid__nolines)
+	.Add_bry_byte(Bry__packed			, Tid__packed)
+	.Add_bry_byte(Bry__packed__hover	, Tid__packed__hover)
+	.Add_bry_byte(Bry__packed__overlay	, Tid__packed__overlay)
+	;
+	public static byte To_tid_or_traditional(byte[] bry) {
+		return bry_hash.Get_as_byte_or(bry, Tid__traditional);
 	}
-	public static byte[] Get_bry_by_tid(byte mode) {
-		switch (mode) {
-			case Traditional_tid:		return Traditional_bry;
-			case Nolines_tid:			return Nolines_bry;
-			case Packed_tid:			return Packed_bry;
-			case Packed_hover_tid:		return Packed_hover_bry;
-			case Packed_overlay_tid:	return Packed_overlay_bry;
-			default:					throw Err_.new_unhandled(mode);
+	public static byte To_tid_or(byte[] src, int bgn, int end, byte or) {
+		return bry_hash.Get_as_byte_or(src, bgn, end, or);
+	}
+	public static byte[] To_bry(byte tid) {
+		switch (tid) {
+			case Tid__traditional:		return Bry__traditional;
+			case Tid__nolines:			return Bry__nolines;
+			case Tid__packed:			return Bry__packed;
+			case Tid__packed__hover:	return Bry__packed__hover;
+			case Tid__packed__overlay:	return Bry__packed__overlay;
+			default:					throw Err_.new_unhandled(tid);
 		}
 	}
-	public static Gallery_mgr_base New_by_mode(byte mode) {
+	public static Gallery_mgr_base New(byte mode) {
 		switch (mode) {
 			default:
-			case Traditional_tid:		return new Gallery_mgr_traditional();
-			case Nolines_tid:			return new Gallery_mgr_nolines();
-			case Packed_tid:			return new Gallery_mgr_packed_base();
-			case Packed_hover_tid:		return new Gallery_mgr_packed_hover();
-			case Packed_overlay_tid:	return new Gallery_mgr_packed_overlay();
+			case Tid__traditional:		return new Gallery_mgr_traditional();
+			case Tid__nolines:			return new Gallery_mgr_nolines();
+			case Tid__packed:			return new Gallery_mgr_packed_base();
+			case Tid__packed__hover:	return new Gallery_mgr_packed_hover();
+			case Tid__packed__overlay:	return new Gallery_mgr_packed_overlay();
 		}
 	}
-	public static boolean Mode_is_packed(byte v) {
-		switch (v) {
-			case Packed_tid:
-			case Packed_hover_tid:
-			case Packed_overlay_tid:	return true;
+	public static boolean Mode_is_packed(byte tid) {
+		switch (tid) {
+			case Tid__packed:
+			case Tid__packed__hover:
+			case Tid__packed__overlay:	return true;
 			default:					return false;
 		}
 	}
-	public static final byte
-	  Traditional_tid		= 0
-	, Nolines_tid			= 1
-	, Packed_tid			= 2
-	, Packed_hover_tid		= 3
-	, Packed_overlay_tid	= 4
-	;
-	public static final byte[]
-	  Traditional_bry		= Bry_.new_a7("traditional")
-	, Nolines_bry			= Bry_.new_a7("nolines")
-	, Packed_bry			= Bry_.new_a7("packed")
-	, Packed_hover_bry		= Bry_.new_a7("packed-hover")
-	, Packed_overlay_bry	= Bry_.new_a7("packed-overlay")
-	;
-	public static final Hash_adp_bry Hash = Hash_adp_bry.ci_a7()
-	.Add_bry_byte(Traditional_bry		, Traditional_tid)
-	.Add_bry_byte(Nolines_bry			, Nolines_tid)
-	.Add_bry_byte(Packed_bry			, Packed_tid)
-	.Add_bry_byte(Packed_hover_bry		, Packed_hover_tid)
-	.Add_bry_byte(Packed_overlay_bry	, Packed_overlay_tid)
-	;
 }
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_basic_tst.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base__basic__tst.java
similarity index 94%
rename from 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_basic_tst.java
rename to 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base__basic__tst.java
index 1642d6cb1..be52da949 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_basic_tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base__basic__tst.java
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
 import org.junit.*;
 import gplx.xowa.htmls.*; import gplx.xowa.files.fsdb.*;
-public class Gallery_mgr_base_basic_tst {
+public class Gallery_mgr_base__basic__tst {
 	private Gallery_mgr_base_fxt fxt = new Gallery_mgr_base_fxt();
 	@Before public void init() {fxt.Reset();}
 	@Test  public void Basic() {
@@ -155,12 +155,6 @@ public class Gallery_mgr_base_basic_tst {
 	@Test   public void Alt__quotes() {	// PURPOSE: file name with quotes will cause broken alt; PAGE:en.w:en.w:Alexandria,_Romania; DATE:2015-12-27
 		fxt.Test_html_frag("<gallery>File:A\"b.png", "alt=\"A&quot;b.png\"");	// NOTE: not 'alt="A"b.png"'
 	}
-//		@Test  public void Ttl_caption() {	// TODO_OLD: category entries get rendered with name only (no ns)
-//			fxt.Test_html_frag
-//			( "<gallery>Category:A</gallery>"
-//			, "<li class='gallerycaption'>B</li>"
-//			);
-//		}
 	@Test   public void Invalid() {	// PURPOSE: ignore invalid file names; DATE:2016-01-12
 		fxt.Test_html_str("<gallery>File:#A.png|a</gallery>"
 		, String_.Concat_lines_nl_skip_last
@@ -177,11 +171,11 @@ public class Gallery_mgr_base_basic_tst {
 class Gallery_mgr_base_fxt {
 	public void Reset() {
 		fxt.Wiki().Xtn_mgr().Init_by_wiki(fxt.Wiki());
-		Gallery_mgr_base.File_found_mode = Bool_.Y_byte;
+		Gallery_mgr_wtr.File_found_mode = Bool_.Y_byte;
 	}
 	public Xop_fxt Fxt() {return fxt;} private final    Xop_fxt fxt = new Xop_fxt();
 	public void Init_files_missing_y_() {
-		Gallery_mgr_base.File_found_mode = Bool_.N_byte;
+		Gallery_mgr_wtr.File_found_mode = Bool_.N_byte;
 	}
 	public void Test_html_str(String raw, String expd)						{fxt.Test_html_full_str(raw, expd);}
 	public void Test_html_frag(String raw, String... expd_frags)		{fxt.Test_html_full_frag(raw, expd_frags);}	// TODO_OLD: change to wiki_str; currently uids do not get reset if wiki
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_xnde_atrs_tst.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base__xatrs__tst.java
similarity index 73%
rename from 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_xnde_atrs_tst.java
rename to 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base__xatrs__tst.java
index ceac450d7..d36a2bc63 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base_xnde_atrs_tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_base__xatrs__tst.java
@@ -18,9 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
 import org.junit.*;
 import gplx.xowa.htmls.*;
-public class Gallery_mgr_base_xnde_atrs_tst {
-	private Gallery_mgr_base_fxt fxt = new Gallery_mgr_base_fxt();
-	@Before public void init() {fxt.Reset();}
+public class Gallery_mgr_base__xatrs__tst {		
+	@Before public void init() {fxt.Reset();} private final    Gallery_mgr_base_fxt fxt = new Gallery_mgr_base_fxt();
 	@Test  public void Atr_misc() {// PURPOSE: add other atrs to end of ul
 		fxt.Test_html_frag
 		( "<gallery id=a>File:A.png</gallery>"
@@ -33,34 +32,34 @@ public class Gallery_mgr_base_xnde_atrs_tst {
 		, "<ul id=\"xowa_gallery_ul_0\" class=\"gallery mw-gallery-traditional\" style=\"max-width:326px; _width:326px; color:blue;\">"
 		);
 	}
-	@Test  public void Atr_caption() {	// PURPOSE: caption atr adds new element
-		fxt.Test_html_frag
-		( "<gallery caption=B>File:A.png</gallery>"
-		, "<li class='gallerycaption'>B</li>"
-		);
-	}
-	@Test  public void Atr_caption_ignore() {	// PURPOSE: blank caption should not create caption element; PAGE:fr.w:Chronologie_du_si�ge_de_Paris_(1870) DATE:2014-08-15
-		fxt.Test_html_frag_n
-		( "<gallery caption=>File:A.png</gallery>"
-		, "<li class='gallerycaption'>"
-		);
-	}
-	@Test  public void Atr_show_filename() {	// PURPOSE: show filename
-		fxt.Test_html_frag
-		( "<gallery showfilename=true>A.png</gallery>"
-		, "<div class=\"gallerytext\"><a href=\"/wiki/File:A.png\">File:A.png</a>"
-		);
-	}
 	@Test  public void Atr_whitelist() {	// PURPOSE: ignore atrs not in whitelist
 		fxt.Test_html_frag
 		( "<gallery onmouseover='alert();'>A.png</gallery>"
 		, "<ul id=\"xowa_gallery_ul_0\" class=\"gallery mw-gallery-traditional\">"
 		);
 	}
-//		@Test  public void Ttl_caption() {	// TODO_OLD: PURPOSE: category entries get rendered with name only (no ns)
-//			fxt.Test_html_frag
-//			( "<gallery>Category:A</gallery>"
-//			, "<li class='gallerycaption'>B</li>"
-//			);
-//		}
+	@Test  public void Mgr_caption() {		// PURPOSE: caption atr adds new element
+		fxt.Test_html_frag
+		( "<gallery caption=B>File:A.png</gallery>"
+		, "<li class=\"gallerycaption\">B</li>"
+		);
+	}
+	@Test  public void Mgr_caption_ignore() {	// PURPOSE: blank caption should not create caption element; PAGE:fr.w:Chronologie_du_si�ge_de_Paris_(1870) DATE:2014-08-15
+		fxt.Test_html_frag_n
+		( "<gallery caption=>File:A.png</gallery>"
+		, "<li class=\"gallerycaption\">"
+		);
+	}
+	@Test  public void Show_filename() {	// PURPOSE: show filename
+		fxt.Test_html_frag
+		( "<gallery showfilename=true>A.png</gallery>"
+		, "<div class=\"gallerytext\"><a href=\"/wiki/File:A.png\">File:A.png</a>"
+		);
+	}
+	//@Test  public void Ttl_caption() {	// PURPOSE: category entries get rendered with name only (no ns)
+	//	fxt.Test_html_frag
+	//	( "<gallery>Category:A</gallery>"
+	//	, "<li class='gallerycaption'>B</li>"
+	//	);
+	//}
 }
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_packed_base.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_packed_base.java
index 9118a7482..294ffe339 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_packed_base.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_packed_base.java
@@ -19,14 +19,12 @@ package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.x
 import gplx.xowa.files.*; import gplx.xowa.htmls.modules.*;
 import gplx.xowa.parsers.lnkis.*;
 public class Gallery_mgr_packed_base extends Gallery_mgr_base {
-	@Override public byte Tid() {return Gallery_mgr_base_.Packed_tid;}
-	@Override public byte[] Tid_bry() {return Gallery_mgr_base_.Packed_bry;}
-	@Override public void Init(int itms_per_row, int itm_default_w, int itm_default_h) {
-		this.itms_per_row = 0;	// Does not support per row option.
+	@Override public byte	Tid() {return Gallery_mgr_base_.Tid__packed;}
+	@Override public void Init(int itm_default_w, int itm_default_h, int itms_per_row) {
 		this.itm_default_w = itm_default_w;
 		this.itm_default_h = itm_default_h;
+		this.itms_per_row = 0;	// Does not support per row option.
 	}
-	@Override public void Itms_per_row_(int v) {}
 	@Override public void Get_modules(Xoae_page page) {
 		super.Get_modules(page);
 		page.Html_data().Head_mgr().Itm__gallery().Enabled_y_();
@@ -66,7 +64,6 @@ public class Gallery_mgr_packed_base extends Gallery_mgr_base {
 	}
 }
 class Gallery_mgr_packed_overlay extends Gallery_mgr_packed_base {
-	@Override public byte[] Tid_bry() {return Gallery_mgr_base_.Packed_overlay_bry;}
 	@Override public void Wrap_gallery_text(Bry_bfr bfr, byte[] gallery_text, int thm_w, int thm_h) {
 		if (gallery_text.length == 0) return; // If we have no text, do not output anything to avoid ugly white overlay.
 		int img_w = this.Get_gb_width(thm_w, thm_h) - this.Get_thumb_padding() - this.Get_gb_padding();
@@ -76,11 +73,10 @@ class Gallery_mgr_packed_overlay extends Gallery_mgr_packed_base {
 			.Add(Wrap_gallery_text_2)
 			;
 	}
-	private static final byte[] 
+	private static final    byte[] 
 	  Wrap_gallery_text_0 = Bry_.new_a7("\n      <div class=\"gallerytextwrapper\" style=\"width: ")
 	, Wrap_gallery_text_1 = Bry_.new_a7("px\"><div class=\"gallerytext\">\n") // NOTE: The newline after <div class="gallerytext"> is needed to accommodate htmltidy
 	, Wrap_gallery_text_2 = Bry_.new_a7("\n      </div></div>")	// NOTE: 2nd </div> is not part of MW, but needed to close div
 	;
 }
-class Gallery_mgr_packed_hover extends Gallery_mgr_packed_overlay {		@Override public byte[] Tid_bry() {return Gallery_mgr_base_.Packed_hover_bry;}
-}
+class Gallery_mgr_packed_hover extends Gallery_mgr_packed_overlay {	}
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr.java
new file mode 100644
index 000000000..8f64ccfc6
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr.java
@@ -0,0 +1,199 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
+import gplx.core.brys.fmtrs.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*;
+import gplx.langs.htmls.*; import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.parsers.htmls.*; import gplx.xowa.htmls.core.makes.imgs.*;
+import gplx.xowa.files.*;
+public class Gallery_mgr_wtr {
+	private static final    Gallery_img_pad_fmtr_arg div_3_fmtr_arg = new Gallery_img_pad_fmtr_arg();
+	private static final    Gallery_box_w_fmtr_arg li_fmtr_arg = new Gallery_box_w_fmtr_arg();
+	public static void Write_mgr(Bry_bfr bfr, Gallery_mgr_base mgr, Xowe_wiki wiki, Xoae_page page, Xop_ctx ctx, Xoh_wtr_ctx hctx, byte[] src, Gallery_xnde xnde) {
+		// init
+		Bry_bfr tmp_bfr = wiki.Utl__bfr_mkr().Get_b512();			
+		boolean hctx_is_hdump = hctx.Mode_is_hdump();
+		int itm_default_w = mgr.Itm_default_w();
+		int itms_per_row = mgr.Itms_per_row();
+
+		// write <ul> lhs
+		int	ul_uid = page.Html_data().Xtn_gallery_next_id();
+		byte[] ul_id = tmp_bfr.Add(Gallery_mgr_wtr_.Id__ul).Add_int_variable(ul_uid).To_bry_and_clear();
+		byte[] ul_style = xnde.Atr_style();
+		if (itms_per_row > 0) {	// "perrow" specified; add "_maxwidth" to div1 style
+			int max_width = itms_per_row * (itm_default_w + mgr.Get_all_padding());
+			ul_style = Fmt_and_add(tmp_bfr, Gallery_mgr_wtr_.Fmtr__ul__style, ul_style, max_width);
+			page.Hdump_data().Imgs_add(new Xohd_img_itm__gallery_mgr(ul_uid, max_width));
+		}
+		byte[] ul_cls = Fmt_and_add(tmp_bfr, Gallery_mgr_wtr_.Fmtr__ul__cls, xnde.Atr_cls(), Gallery_mgr_base_.To_bry(mgr.Tid()));
+		Write_ul_lhs(bfr, tmp_bfr, hctx_is_hdump, wiki.Appe().Html_mgr().Whitelist_mgr(), src, xnde, ul_id, ul_cls, ul_style, xnde.Atrs_other());
+
+		// write gallery_caption; EX: <li class='gallerycaption'>caption</li>
+		byte[] mgr_caption = xnde.Mgr_caption();
+		if (Bry_.Len_gt_0(mgr_caption)) Gallery_mgr_wtr_.Fmtr__mgr_caption.Bld_bfr_many(bfr, mgr_caption);
+
+		// write <li> items
+		Xoae_app app = wiki.Appe(); Xoh_html_wtr html_wtr = wiki.Html_mgr().Html_wtr();
+		int itm_len = xnde.Itms_len();
+		for (int i = 0; i < itm_len; i++)
+			Write_itm(bfr, tmp_bfr, app, wiki, page, ctx, html_wtr, hctx, src, mgr, xnde, i, null);
+		bfr.Add_byte_nl().Add(Gfh_tag_.Ul_rhs);	// "\n</ul>"
+
+		tmp_bfr.Mkr_rls();
+	}
+	public static void Write_itm(Bry_bfr bfr, Bry_bfr tmp_bfr, Xoae_app app, Xowe_wiki wiki, Xoae_page page, Xop_ctx ctx, Xoh_html_wtr html_wtr, Xoh_wtr_ctx hctx
+		, byte[] src, Gallery_mgr_base mgr, Gallery_xnde xnde, int i, Xof_file_itm xfer_itm) {
+		boolean hctx_is_hdump = hctx.Mode_is_hdump();
+
+		// get itm ttl / caption
+		Gallery_itm itm = (Gallery_itm)xnde.Itms_get_at(i);
+		Xoa_ttl itm_ttl = itm.Ttl(); if (Bry_.Len_eq_0(itm_ttl.Page_db())) return;	// if file ttl is invalid, do not write; EX:File:#A.png; DATE:2016-01-12
+		byte[] itm_caption = itm.Caption_bry(); if (itm_caption == null) itm_caption = Bry_.Empty;
+
+		// get lnki, xfer, html_w_expand, html_h_expand
+		Xop_lnki_tkn lnki = itm.Lnki_tkn();
+		int lnki_w_orig = lnki.W(), lnki_h_orig = lnki.H(); // capture orig lnki_w / lnki_h for later
+		mgr.Get_thumb_size(lnki, itm.Ext());				// noop if traditional; expand by 1.5 if packed
+		if (xfer_itm == null) {								// will be null on 1st pass
+			xfer_itm = html_wtr.Lnki_wtr().File_wtr().Lnki_eval(Xof_exec_tid.Tid_wiki_page, ctx, page, lnki);
+			xfer_itm.Html_gallery_mgr_h_(xnde.Itm_h_actl());
+			xfer_itm.Html_elem_tid_(Xof_html_elem.Tid_gallery_v2);
+		}
+		int html_w_expand = xfer_itm.Html_w();
+		int html_h_expand = xfer_itm.Html_h();
+
+		// get id
+		int img_uid = xfer_itm.Html_uid();
+		byte[] li_id = Gallery_mgr_wtr_.Bld_id(tmp_bfr, Gallery_mgr_wtr_.Id__li, img_uid);
+		byte[] li_id_atr = Gallery_mgr_wtr_.Bld_id_atr(tmp_bfr, hctx_is_hdump, li_id);
+
+		// get file_found
+		boolean file_found = xfer_itm.File_exists();
+		if (File_found_mode != Bool_.__byte) file_found = File_found_mode == Bool_.Y_byte;	// TEST: override File_found
+
+		// make itm_html; 1st clause is for "missing" itms; 2nd clause is for "found" itms
+		byte[] itm_html = Bry_.Empty;
+		int div_2_w = -1, div_3_margin = -1;
+		if (	!hctx_is_hdump					// not hdump; hdump should always write img regardless of whether or not img is missing; DATE:2015-04-27
+			&&	(	!itm_ttl.Ns().Id_is_file()	// not a file
+				||	!file_found					// file is missing
+				)
+			) {									// write text
+			itm_html = Gallery_mgr_wtr_.Fmtr__div1__missing.Bld_bry_many(tmp_bfr, mgr.Get_thumb_padding() + mgr.Itm_default_h(), itm_ttl.Page_txt());
+			itm.Html_prepare(wiki, ctx, src, xnde, xfer_itm, li_id, i);
+			xfer_itm.Html_img_wkr_(itm);
+			lnki.W_(lnki_w_orig).H_(lnki_h_orig);
+			html_w_expand = lnki_w_orig;		// reset lnki_w_orig / lnki_h_orig else large captions
+			html_h_expand = lnki_h_orig;		
+		}
+		else {
+			// get alt
+			byte[] alt = itm.Alt_bgn() == Bry_find_.Not_found && Bry_.Len_eq_0(itm_caption)	//	if ( $alt == '' && $text == '' )  $imageParameters['alt'] = $nt->getText();
+				? itm.Ttl().Page_txt()
+				: Bry_.Mid(src, itm.Alt_bgn(), itm.Alt_end());
+			alt = Xoh_html_wtr_escaper.Escape(app.Parser_amp_mgr(), tmp_bfr, alt);	// NOTE: need to handle situations wherein alt has quotes; EX:File:A"b.png; PAGE:en.w:Alexandria,_Romania DATE:2015-12-27
+
+			// get href_ttl
+			Xoa_ttl href_ttl = itm.Link_bgn() == Bry_find_.Not_found
+				? itm_ttl
+				: Xoa_ttl.parse(wiki, Bry_.Mid(src, itm.Link_bgn(), itm.Link_end()));
+			if (href_ttl == null) href_ttl = itm_ttl;	// occurs when link is invalid; EX: A.png|link=<invalid>
+
+			// get w, h
+			mgr.Adjust_image_parameters(xfer_itm);		// noop if traditional; reduce by 1.5 if packed
+			int html_w_normal = xfer_itm.Html_w();
+			int html_h_normal = xfer_itm.Html_h();
+			xfer_itm.Init_at_gallery_bgn(html_w_normal, html_h_normal, html_w_expand);// NOTE: file_w should be set to expanded width so js can resize if gallery
+
+			// write div_2
+			div_2_w = mgr.Get_thumb_div_width(html_w_expand);
+			Gallery_mgr_wtr_.Fmtr__div1__img.Bld_bfr_many(tmp_bfr, div_2_w);
+
+			// write div_3
+			div_3_margin = mgr.Get_vpad(mgr.Itm_default_h(), html_h_expand);
+			Gallery_mgr_wtr_.Fmtr__div1__vpad.Bld_bfr_many(tmp_bfr, div_3_fmtr_arg.Init(img_uid, div_3_margin));	// <div style="margin:~{vpad}px auto;">
+
+			// write <img>
+			wiki.Html_mgr().Html_wtr().Lnki_wtr().Write_file(tmp_bfr, ctx, hctx, src, lnki, xfer_itm, alt);
+			tmp_bfr.Add(itm_divs_end_bry);
+			itm_html = tmp_bfr.To_bry_and_clear();
+		}
+
+		// write <li>
+		int div_1_w = mgr.Get_gb_width(html_w_expand, html_h_expand);
+		Gallery_mgr_wtr_.Fmtr__li__lhs.Bld_bfr_many(bfr, li_id_atr, li_fmtr_arg.Init(img_uid, div_1_w));
+		bfr.Add(itm_html);
+
+		// get show_filenames_link
+		byte[] show_filenames_link = Bry_.Empty;
+		if (xnde.Show_filename()) {
+			wiki.Html_mgr().Html_wtr().Lnki_wtr().Write_plain_by_bry
+			( tmp_bfr, src, lnki
+			, Bry_.Limit(itm_ttl.Page_txt(), 25)	// 25 is defined by captionLength in DefaultSettings.php
+			);										// MW:passes know,noclasses which isn't relevant to XO
+		}
+
+		// write caption
+		wiki.Parser_mgr().Main().Parse_text_to_html(tmp_bfr, page, hctx, true, itm_caption);
+		itm_caption = tmp_bfr.To_bry_and_clear();
+		itm_caption = tmp_bfr.Add(show_filenames_link).Add(itm_caption).To_bry_and_clear();
+		mgr.Wrap_gallery_text(bfr, itm_caption, html_w_expand, html_h_expand);
+		bfr.Add(itm_li_end_bry);
+
+		if (hctx_is_hdump)
+			page.Hdump_data().Imgs_add_img(new Xohd_img_itm__gallery_itm().Data_init_gallery(div_1_w, div_2_w, div_3_margin), xfer_itm, Xohd_img_itm__gallery_itm.Tid_gallery);
+	}
+
+	public static byte File_found_mode = Bool_.__byte;
+	private static byte[] Fmt_and_add(Bry_bfr tmp_bfr, Bry_fmtr fmtr, byte[] trailer, Object... fmtr_args) {
+		fmtr.Bld_bfr_many(tmp_bfr, fmtr_args);
+		if (Bry_.Len_gt_0(trailer)) {
+			tmp_bfr.Add_byte_space();
+			tmp_bfr.Add(trailer);
+		}
+		return tmp_bfr.To_bry_and_clear();
+	}
+	private static void Write_ul_lhs(Bry_bfr bfr, Bry_bfr tmp_bfr, boolean hctx_is_hdump, Xop_xatr_whitelist_mgr whitelist_mgr, byte[] src, Gallery_xnde xnde, byte[] ul_id, byte[] ul_cls, byte[] ul_style, List_adp xatr_list) {
+		bfr.Add_byte(Byte_ascii.Lt).Add(Gfh_tag_.Bry__ul);
+		if (hctx_is_hdump) {	// if hdump, write extra data;
+			tmp_bfr.Add_int_variable(xnde.Itm_w_orig()).Add_byte_pipe();
+			tmp_bfr.Add_int_variable(xnde.Itm_h_orig()).Add_byte_pipe();
+			tmp_bfr.Add_int_variable(xnde.Itms_per_row());
+			Gfh_wtr.Write_atr_bry(bfr, Bry__data_xogly, tmp_bfr.To_bry_and_clear());
+		}
+		else					// not hdump; write id attribute
+			Gfh_wtr.Write_atr_bry(bfr, Gfh_atr_.Bry__id, ul_id);
+		Gfh_wtr.Write_atr_bry(bfr, Gfh_atr_.Bry__class, ul_cls);
+		Gfh_wtr.Write_atr_bry(bfr, Gfh_atr_.Bry__style, ul_style);
+		if (xatr_list != null) {
+			int len = xatr_list.Count();
+			for (int i = 0; i < len; i++) {
+				Mwh_atr_itm xatr = (Mwh_atr_itm)xatr_list.Get_at(i);
+				if (!whitelist_mgr.Chk(Xop_xnde_tag_.Tid__ul, src, xatr)) continue;
+				byte[] key = xatr.Key_bry();
+				byte[] val = xatr.Val_as_bry();
+				Gfh_wtr.Write_atr_bry(bfr, key, val);
+			}
+		}
+		bfr.Add_byte(Byte_ascii.Gt);
+	}
+	private static final    byte[] 
+	  itm_li_end_bry	= Bry_.new_a7		  ( "\n    </div>"
+											  + "\n  </li>")
+	, itm_divs_end_bry	= Bry_.new_a7		  ( "\n        </div>\n      </div>");
+	public static final    byte[] Bry__data_xogly = Bry_.new_a7 ("data-xogly");
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr_.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr_.java
similarity index 51%
rename from 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr_.java
rename to 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr_.java
index 384be5637..04aacb997 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr_.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr_.java
@@ -18,63 +18,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
 import gplx.core.brys.fmtrs.*;
 import gplx.xowa.parsers.*; import gplx.xowa.htmls.core.htmls.*;
-public class Gallery_html_wtr_ {
-	public static final byte[] Cls_packed = Bry_.new_a7(" mw-gallery-packed");
-	public static final Bry_fmtr
-	  Fmtr__ul__nde = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
-	( "<ul~{id} class=\"gallery~{cls}\" style=\"~{style}\">~{itm_list}"
-	, "</ul>"
-	), "id", "cls", "style", "itm_list"
-	)
-	, Mgr_box_style_none	= Bry_fmtr.new_()
-	, Mgr_box_style_max		= Bry_fmtr.new_("max-width:~{gallery_width}px; _width:~{gallery_width}px;", "gallery_width")
-	, Itm_img_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
-	( ""
-	, "  <li id=\"xowa_gallery_li_~{img_id}\" class=\"gallerybox\" style=\"width:~{itm_box_width}px;\">"
-	, "    <div id=\"xowa_gallery_div1_~{img_id}\" style=\"width:~{itm_box_width}px;\">"
-	, "      <div id=\"xowa_gallery_div2_~{img_id}\" class=\"thumb\" style=\"width:~{itm_div_width}px;\">"
-	, "        <div id=\"xowa_gallery_div3_~{img_id}\" style=\"margin:~{itm_margin}px auto;\">"
-	, "          <a href=\"~{img_href}\" class=\"image\">"
-	, "            <img id=\"xoimg_~{img_id}\" alt=\"~{img_alt}\"~{img_core} />"
-	, "          </a>"
-	, "        </div>"
-	, "      </div>"
-	, "      <div class=\"gallerytext\">~{itm_caption}"
-	, "      </div>"
-	, "    </div>"
-	, "  </li>"
-	), "itm_box_width", "itm_div_width", "itm_margin", "img_id", "img_ttl", "img_href", "img_core", "itm_caption", "img_alt"
-	)
-	, Itm_txt_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
-	( ""
-	, "  <li id=\"xowa_gallery_li_~{img_id}\" class=\"gallerybox\" style=\"width:~{itm_box_width};\">"
-	, "    <div id=\"xowa_gallery_div1_~{img_id}\" style=\"width:~{itm_box_width};\">"
-	, "      <div id=\"xowa_gallery_div2_~{img_id}\" style=\"~{itm_div_height}\">"
-	, "        ~{itm_text}"
-	, "      </div>"
-	, "      <div class=\"gallerytext\">~{itm_caption}"
-	, "      </div>"
-	, "    </div>"
-	, "  </li>"
-	), "itm_box_width", "itm_div_height", "itm_text", "itm_caption"
-	);
-	public static final Bry_fmtr
+public class Gallery_mgr_wtr_ {
+	public static final    Bry_fmtr
 	  Fmtr__ul__style				= Bry_fmtr.new_(	"max-width:~{max_width}px; _width:~{max_width}px;", "max_width")
 	, Fmtr__ul__cls					= Bry_fmtr.new_(	"gallery mw-gallery-~{mode}", "mode")
-	, Fmtr__li__txt					= Bry_fmtr.new_(	"\n  <li class='gallerycaption'>~{caption}</li>", "caption")
-	, Fmtr__li__img					= Bry_fmtr.new_(	"\n  <li~{li_id} class=\"gallerybox\" ~{itm_box_w}>"
+	, Fmtr__mgr_caption				= Bry_fmtr.new_(	"\n  <li class=\"gallerycaption\">~{caption}</li>", "caption")
+	, Fmtr__li__lhs					= Bry_fmtr.new_(	"\n  <li~{li_id} class=\"gallerybox\" ~{itm_box_w}>"
 													  + "\n    <div ~{itm_box_w}>", "li_id", "itm_box_w")
 	, Fmtr__div1__img				= Bry_fmtr.new_(	"\n      <div class=\"thumb\" style=\"width:~{width}px;\">", "width")
 	, Fmtr__div1__missing			= Bry_fmtr.new_(	"\n      <div class=\"thumb\" style=\"height:~{height}px;\">~{ttl_text}</div>", "height", "ttl_text")
-	, itm_div1_fmtr					= Bry_fmtr.new_(	"\n        <div ~{vpad}>\n          ", "vpad")
+	, Fmtr__div1__vpad				= Bry_fmtr.new_(	"\n        <div ~{vpad}>\n          ", "vpad")
 	, hdump_box_w_fmtr				= Bry_fmtr.new_(	"width:~{width}px;", "width")
 	, hdump_img_pad_fmtr			= Bry_fmtr.new_(	"margin:~{width}px auto;", "width")
 	;
-	public static final byte[] 
+	public static final    byte[] 
 	  Id__ul	= Bry_.new_a7("xowa_gallery_ul_")
 	, Id__li	= Bry_.new_a7("xowa_gallery_li_")
 	;
-	private static final byte[] Id__atr = Bry_.new_a7(" id=\"");
+	private static final    byte[] Id__atr = Bry_.new_a7(" id=\"");
 	public static byte[] Bld_id(Bry_bfr bfr, byte[] prefix, int id)			{return bfr.Add(prefix).Add_int_variable(id).To_bry_and_clear();}
 	public static byte[] Bld_id_atr(Bry_bfr bfr, boolean hdump, byte[] li_id)	{return hdump ? Bry_.Empty : bfr.Add(Id__atr).Add(li_id).Add_byte_quote().To_bry_and_clear();}
 	public static byte[] Bld_caption(Xowe_wiki wiki, Xop_ctx ctx, Xoh_html_wtr wtr, Xoh_wtr_ctx hctx, Gallery_itm itm) {
@@ -87,4 +48,8 @@ public class Gallery_html_wtr_ {
 		}
 		return rv;
 	}
+	public static int Calc_vpad(int mgr_itm_height, int html_h) {
+		int	min_thumb_height = html_h > 17 ? html_h : 17;						// $minThumbHeight =  $thumb->height > 17 ? $thumb->height : 17;
+		return (int)Math_.Floor((30 + mgr_itm_height - min_thumb_height) / 2);	// $vpad = floor(( self::THUMB_PADDING + $this->mHeights - $minThumbHeight ) /2);
+	}
 }
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser.java
similarity index 96%
rename from 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser.java
rename to 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser.java
index 6da62217c..d7d816901 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser.java
@@ -21,7 +21,7 @@ import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*;
 import gplx.xowa.wikis.nss.*;
 import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.lnkis.files.*; import gplx.xowa.parsers.tmpls.*;
 import gplx.xowa.files.*;
-public class Gallery_itm_parser {		
+public class Gallery_parser {		
 	private Xowe_wiki wiki; private Btrie_slim_mgr trie = Btrie_slim_mgr.ci_u8();
 	private Gallery_itm cur_itm;
 	private byte[] src; private int end_pos;
@@ -30,7 +30,7 @@ public class Gallery_itm_parser {
 	private int itm_bgn;
 	private Bry_bfr caption_bfr = Bry_bfr_.Reset(255); private int caption_bgn;
 	private Xop_ctx ctx;
-	public Gallery_itm_parser Init_by_wiki(Xowe_wiki wiki) {
+	public Gallery_parser Init_by_wiki(Xowe_wiki wiki) {
 		this.wiki = wiki; Xol_lang_itm lang = wiki.Lang();
 		this.ctx = wiki.Parser_mgr().Ctx();
 		trie.Clear();
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser_tst.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser_tst.java
similarity index 92%
rename from 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser_tst.java
rename to 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser_tst.java
index d8e10c4e8..f03c17515 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_itm_parser_tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser_tst.java
@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
 import org.junit.*; import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*;
-public class Gallery_itm_parser_tst {
-	@Before public void init() {fxt.Init();} private Gallery_itm_parser_fxt fxt = new Gallery_itm_parser_fxt();
+public class Gallery_parser_tst {
+	@Before public void init() {fxt.Init();} private Gallery_parser_fxt fxt = new Gallery_parser_fxt();
 	@Test   public void All()				{fxt.Test_parse("File:A.png|a|alt=b|link=c"		, fxt.Expd("File:A.png", "a" , "b" , "c"));}
 	@Test   public void Ttl_only()			{fxt.Test_parse("File:A.png"					, fxt.Expd("File:A.png", null, null, null));}
 	@Test   public void Ttl_url_encoded()	{fxt.Test_parse("File:A%28b%29.png"				, fxt.Expd("File:A(b).png"));}			// PURPOSE: handle url-encoded sequences; DATE:2014-01-01
@@ -65,13 +65,13 @@ public class Gallery_itm_parser_tst {
 		fxt.Test_parse("File:A.png|alt=a|b", fxt.Expd("File:A.png", "b", "a"));
 	}
 }
-class Gallery_itm_parser_fxt {
+class Gallery_parser_fxt {
 	private Xoae_app app; private Xowe_wiki wiki;
-	private Gallery_itm_parser parser;
-	public Gallery_itm_parser_fxt Init() {
+	private Gallery_parser parser;
+	public Gallery_parser_fxt Init() {
 		this.app = Xoa_app_fxt.Make__app__edit();
 		this.wiki = Xoa_app_fxt.Make__wiki__edit(app);
-		parser = new Gallery_itm_parser();
+		parser = new Gallery_parser();
 		parser.Init_by_wiki(wiki);
 		return this;
 	}
@@ -87,7 +87,7 @@ class Gallery_itm_parser_fxt {
 	public void Test_parse(String raw, String[]... expd) {
 		List_adp actl = List_adp_.New();
 		byte[] src = Bry_.new_a7(raw);
-		parser.Parse_all(actl, Gallery_mgr_base_.New_by_mode(Gallery_mgr_base_.Traditional_tid), new Gallery_xnde(), src, 0, src.length);
+		parser.Parse_all(actl, Gallery_mgr_base_.New(Gallery_mgr_base_.Tid__traditional), new Gallery_xnde(), src, 0, src.length);
 		Tfds.Eq_ary(String_.Ary_flatten(expd), String_.Ary_flatten(Xto_str_ary(src, actl)));
 	}
 	private String[][] Xto_str_ary(byte[] src, List_adp list) {
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde.java
index e701fe9d1..34a8cbdec 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde.java
@@ -16,115 +16,83 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-import gplx.core.primitives.*; import gplx.dbs.cfgs.*;
-import gplx.fsdb.meta.*;
-import gplx.xowa.parsers.logs.*;
-import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*;
 import gplx.xowa.parsers.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.htmls.*;
-public class Gallery_xnde implements Xox_xnde, Mwh_atr_itm_owner1 {
+import gplx.dbs.cfgs.*; import gplx.xowa.parsers.logs.*; 
+import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.files.fsdb.*;
+public class Gallery_xnde implements Xox_xnde, Mwh_atr_itm_owner2 {
 	private Gallery_xtn_mgr xtn_mgr;
-	public byte Mode()						{return mode;} private byte mode;
-	public int Itm_w()						{return itm_w;} private int itm_w = Null;
-	public int Itm_h()						{return itm_h;} private int itm_h = Null;
-	public int Itms_per_row()				{return itms_per_row;} private int itms_per_row = Null;
-	public boolean Show_filename()				{return show_filename;} private boolean show_filename = false;
-	public byte[] Atr_caption()				{return atr_caption;} private byte[] atr_caption = Bry_.Empty;
-	public byte[] Atr_style()				{return atr_style;} private byte[] atr_style = Bry_.Empty;
-	public byte[] Atr_cls()					{return atr_cls;} private byte[] atr_cls = Bry_.Empty;
-	public List_adp Atrs_other()			{return atrs_other;} private List_adp atrs_other;
-	public int Itm_w_or_default()			{return itm_w == Null ? Default : itm_w;}
-	public int Itm_h_or_default()			{return itm_h == Null ? Default : itm_h;}
-	public int Itms_len()					{return itms.Count();} private List_adp itms = List_adp_.New();
-	public Gallery_itm Itms_get_at(int i)	{return (Gallery_itm)itms.Get_at(i);}
-	public Gallery_mgr_base Gallery_mgr()	{return gallery_mgr;} private Gallery_mgr_base gallery_mgr;
-	private boolean html_wtr_v1 = false;
-	public void Xatr__set(Xowe_wiki wiki, byte[] src, Mwh_atr_itm xatr, Object xatr_id_obj) {
-		if (xatr_id_obj != null) {
-			Byte_obj_val xatr_id = (Byte_obj_val)xatr_id_obj;
-			switch (xatr_id.Val()) {
-				case Gallery_xnde_atrs.Mode_tid:			mode = Gallery_mgr_base_.Get_or_traditional(xatr.Val_as_bry()); break;
-				case Gallery_xnde_atrs.Perrow_tid:			itms_per_row = xatr.Val_as_int_or(Null); break;
-				case Gallery_xnde_atrs.Widths_tid:			itm_w = xatr.Val_as_int_or(Null); break;
-				case Gallery_xnde_atrs.Heights_tid:			itm_h = xatr.Val_as_int_or(Null); break;
-				case Gallery_xnde_atrs.Showfilename_tid:	show_filename = xatr.Val_as_bool(); break;
-				case Gallery_xnde_atrs.Caption_tid:			if (xatr.Key_exists()) atr_caption = xatr.Val_as_bry(); break;	// NOTE: do not create caption for key only; EX:<gallery caption=> PAGE:fr.w:Chronologie_du_si�ge_de_Paris_(1870); DATE:2014-08-15
-				case Gallery_xnde_atrs.Style_tid:			atr_style = xatr.Val_as_bry(); break;
-				case Gallery_xnde_atrs.Class_tid:			atr_cls = xatr.Val_as_bry(); break;
-			}
-		}
-		else {
-			if (atrs_other == null) atrs_other = List_adp_.New();
-			atrs_other.Add(xatr);
+	public byte					Mode()						{return mode;} private byte mode;
+	public int					Itm_w_orig()				{return itm_w_orig;} private int itm_w_orig = Null;
+	public int					Itm_h_orig()				{return itm_h_orig;} private int itm_h_orig = Null;
+	public int					Itm_w_actl()				{return itm_w_actl;} private int itm_w_actl = Null;
+	public int					Itm_h_actl()				{return itm_h_actl;} private int itm_h_actl = Null;
+	public int					Itms_per_row()				{return itms_per_row;} private int itms_per_row = Null;
+	public int					Itms_len()					{return itms.Count();} private final    List_adp itms = List_adp_.New();
+	public Gallery_itm			Itms_get_at(int i)			{return (Gallery_itm)itms.Get_at(i);}
+	public byte[]				Atr_style()					{return atr_style;} private byte[] atr_style = Bry_.Empty;
+	public byte[]				Atr_cls()					{return atr_cls;} private byte[] atr_cls = Bry_.Empty;
+	public List_adp				Atrs_other()				{return atrs_other;} private List_adp atrs_other;
+	public boolean				Show_filename()				{return show_filename;} private boolean show_filename = false;
+	public byte[]				Mgr_caption()				{return mgr_caption;} private byte[] mgr_caption = Bry_.Empty;
+	public Gallery_mgr_base		Gallery_mgr()				{return gallery_mgr;} private Gallery_mgr_base gallery_mgr;
+	public void Xatr__set(Xowe_wiki wiki, byte[] src, Mwh_atr_itm xatr, byte xatr_id) {
+		switch (xatr_id) {
+			case Gallery_xnde_atrs.Tid__mode:			mode = Gallery_mgr_base_.To_tid_or_traditional(xatr.Val_as_bry()); break;
+			case Gallery_xnde_atrs.Tid__perrow:			itms_per_row = xatr.Val_as_int_or(Null); break;
+			case Gallery_xnde_atrs.Tid__widths:			itm_w_orig = itm_w_actl = xatr.Val_as_int_or(Null); break;
+			case Gallery_xnde_atrs.Tid__heights:		itm_h_orig = itm_h_actl = xatr.Val_as_int_or(Null); break;
+			case Gallery_xnde_atrs.Tid__style:			atr_style = xatr.Val_as_bry(); break;
+			case Gallery_xnde_atrs.Tid__class:			atr_cls = xatr.Val_as_bry(); break;
+			case Gallery_xnde_atrs.Tid__showfilename:	show_filename = xatr.Val_as_bool(); break;
+			case Gallery_xnde_atrs.Tid__caption:		if (xatr.Key_exists()) mgr_caption = xatr.Val_as_bry(); break;	// NOTE: do not create caption for key only; EX:<gallery caption=> PAGE:fr.w:Chronologie_du_si�ge_de_Paris_(1870); DATE:2014-08-15
+			default:
+				if (atrs_other == null) atrs_other = List_adp_.New();
+				atrs_other.Add(xatr);
+				break;
 		}
 	}
 	public void Xtn_parse(Xowe_wiki wiki, Xop_ctx ctx, Xop_root_tkn root, byte[] src, Xop_xnde_tkn xnde) {
+		Xox_xnde_.Parse_xatrs(wiki, this, Gallery_xnde_atrs.Key_hash, src, xnde);
+		ctx.Para().Process_block__xnde(xnde.Tag(), Xop_xnde_tag.Block_bgn);			// cancel pre for <gallery>; DATE:2014-03-11
 		try {
-			ctx.Para().Process_block__xnde(xnde.Tag(), Xop_xnde_tag.Block_bgn);			// cancel pre for <gallery>; DATE:2014-03-11
-			Xox_xnde_.Xatr__set(wiki, this, Gallery_xnde_atrs.Key_hash, src, xnde);
-			xtn_mgr = (Gallery_xtn_mgr)wiki.Xtn_mgr().Get_or_fail(Gallery_xtn_mgr.XTN_KEY);
-			Init_atrs(wiki);
+			// do further post-processing of vars based on wiki's fsdb.cfg
+			Init_xnde_by_atrs(wiki);
 			gallery_mgr.Get_modules(ctx.Page());
-			Gallery_itm_parser parser = xtn_mgr.Parser();
-			if (parser.Parse_in_progress()) parser = new Gallery_itm_parser().Init_by_wiki(wiki);	// handle nested galleries; EX: <gallery><ref><gallery>; PAGE:es.w:Arquitectura_medieval DATE:2015-07-10
+
+			// parse
+			xtn_mgr = (Gallery_xtn_mgr)wiki.Xtn_mgr().Get_or_fail(Gallery_xtn_mgr.XTN_KEY);
+			Gallery_parser parser = xtn_mgr.Parser();
+			if (parser.Parse_in_progress()) parser = new Gallery_parser().Init_by_wiki(wiki);	// handle nested galleries; EX: <gallery><ref><gallery>; PAGE:es.w:Arquitectura_medieval DATE:2015-07-10
 			parser.Parse_all(itms, gallery_mgr, this, src, xnde.Tag_open_end(), xnde.Tag_close_bgn());
-			boolean log_wkr_enabled = Log_wkr != Xop_log_basic_wkr.Null; if (log_wkr_enabled) Log_wkr.Log_end_xnde(ctx.Page(), Xop_log_basic_wkr.Tid_gallery, src, xnde);
-			ctx.Para().Process_block__xnde(xnde.Tag(), Xop_xnde_tag.Block_end);			// cancel pre for <gallery>; DATE:2014-03-11
 		} catch (Exception exc) {
-			wiki.Appe().Usr_dlg().Warn_many("", "", "failed to write gallery; src=~{0} err=~{1}", String_.new_u8(src, xnde.Src_bgn(), xnde.Src_end()), Err_.Message_gplx_full(exc));
+			Gfo_usr_dlg_.Instance.Warn_many("", "", "failed to write gallery; src=~{0} err=~{1}", String_.new_u8(src, xnde.Src_bgn(), xnde.Src_end()), Err_.Message_gplx_full(exc));
 		}
+		ctx.Para().Process_block__xnde(xnde.Tag(), Xop_xnde_tag.Block_end);			// cancel pre for <gallery>; DATE:2014-03-11
+		boolean log_wkr_enabled = Log_wkr != Xop_log_basic_wkr.Null; if (log_wkr_enabled) Log_wkr.Log_end_xnde(ctx.Page(), Xop_log_basic_wkr.Tid_gallery, src, xnde);
 	}	public static Xop_log_basic_wkr Log_wkr = Xop_log_basic_wkr.Null;
 	public void Xtn_write(Bry_bfr bfr, Xoae_app app, Xop_ctx ctx, Xoh_html_wtr html_wtr, Xoh_wtr_ctx hctx, Xop_xnde_tkn xnde, byte[] src) {
-		Xowe_wiki wiki = ctx.Wiki();
-		try {
-			if (html_wtr_v1)
-				xtn_mgr.Html_wtr().Write_html(bfr, app, wiki, ctx, html_wtr, hctx, ctx.Page(), this, src);
-			else {
-				gallery_mgr.Write_html(bfr, wiki, ctx.Page(), ctx, hctx, src, this);
-			}
-		} catch (Exception exc) {
-			wiki.Appe().Usr_dlg().Warn_many("", "", "failed to write gallery; src=~{0} err=~{1}", String_.new_u8(src, xnde.Src_bgn(), xnde.Src_end()), Err_.Message_gplx_full(exc));
-		}
+		try		{Gallery_mgr_wtr.Write_mgr(bfr, gallery_mgr, ctx.Wiki(), ctx.Page(), ctx, hctx, src, this);}
+		catch	(Exception e) {Gfo_usr_dlg_.Instance.Warn_many("", "", "failed to write gallery; src=~{0} err=~{1}", String_.new_u8(src, xnde.Src_bgn(), xnde.Src_end()), Err_.Message_gplx_log(e));}
 	}
-	private void Init_atrs(Xowe_wiki wiki) {
+	private void Init_xnde_by_atrs(Xowe_wiki wiki) {
 		Db_cfg_hash cfg_grp = wiki.File_mgr().Cfg_get(Xof_fsdb_mgr_cfg.Grp_xowa);
 		if (cfg_grp.Get_by(Xof_fsdb_mgr_cfg.Key_gallery_fix_defaults).To_yn_or_n()) {
-			if (itm_w == Gallery_xnde.Null && itm_h == Gallery_xnde.Null)	// if no w/h specified, set both to default (just like v1)
-				itm_w = itm_h = Gallery_xnde.Default;
+			if (itm_w_actl == Gallery_xnde.Null && itm_h_actl == Gallery_xnde.Null)	// if no w/h specified, set both to default (just like v1)
+				itm_w_actl = itm_h_actl = Gallery_xnde.Default;
 		}
-		else {
-			if (itm_w == Gallery_xnde.Null) itm_w = Gallery_xnde.Default;
-			if (itm_h == Gallery_xnde.Null) itm_h = Gallery_xnde.Default;
-		}
-		gallery_mgr = Gallery_mgr_base_.New_by_mode(mode);
-		if (	!wiki.File_mgr().Version_1_y()											// v2: fsdb
+		gallery_mgr = Gallery_mgr_base_.New(mode);
+		if (	!wiki.File_mgr().Version_1_y()												// v2: fsdb
 			&&	!cfg_grp.Get_by(Xof_fsdb_mgr_cfg.Key_gallery_packed).To_yn_or_n() 			// packed not supported
 			) {
-			gallery_mgr = Gallery_mgr_base_.New_by_mode(Gallery_mgr_base_.Traditional_tid);	// always go to traditional
-			html_wtr_v1 = true;
+			gallery_mgr = Gallery_mgr_base_.New(Gallery_mgr_base_.Tid__traditional);		// always go to traditional
+		}
+		if (itm_w_actl == Gallery_xnde.Null) itm_w_actl = Gallery_xnde.Default;
+		if (itm_h_actl == Gallery_xnde.Null) itm_h_actl = Gallery_xnde.Default;
+		gallery_mgr.Init(this.Itm_w_actl(), this.Itm_h_actl(), itms_per_row);
+		if (Bry_.Eq(wiki.Domain_itm().Domain_bry(), gplx.xowa.wikis.domains.Xow_domain_itm_.Bry__commons)) {	// HACK.CFG: for commons, hardcode itms per row as 8; DATE:2016-06-30
+			itms_per_row = 8;
 		}
-		gallery_mgr.Init(itms_per_row, this.Itm_w_or_default(), this.Itm_h_or_default());
 	}
-	public static final int Default = 120, Null = -1;
-}
-class Gallery_xnde_atrs {
-	public static final byte 
-	  Mode_tid			= 0
-	, Perrow_tid		= 1
-	, Widths_tid		= 2
-	, Heights_tid		= 3
-	, Caption_tid		= 4
-	, Showfilename_tid	= 5
-	, Style_tid			= 6
-	, Class_tid			= 7
-	;
-	public static Hash_adp_bry Key_hash = Hash_adp_bry.ci_a7()
-	.Add_str_byte("mode"			, Mode_tid)
-	.Add_str_byte("perrow"			, Perrow_tid)
-	.Add_str_byte("widths"			, Widths_tid)
-	.Add_str_byte("heights"			, Heights_tid)
-	.Add_str_byte("caption"			, Caption_tid)
-	.Add_str_byte("showfilename"	, Showfilename_tid)
-	.Add_str_byte("style"			, Style_tid)
-	.Add_str_byte("class"			, Class_tid)
-	;
+	public static final int Default = 120;
+	private static final int Null = -1;
 }
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr_utl.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde_atrs.java
similarity index 52%
rename from 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr_utl.java
rename to 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde_atrs.java
index 995aa1854..f024ee88a 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html_wtr_utl.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde_atrs.java
@@ -16,12 +16,25 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-public class Gallery_html_wtr_utl {
-	public static int Calc_itm_div_len(int v) {return v + 30;}		// 30=Thumb padding; REF.MW:ImageGallery.php|THUMB_PADDING
-	public static int Calc_itm_box_w(int v) {return v + 5;}			// 5=Gallery Box padding; REF.MW:ImageGallery.php|GB_PADDING
-	public static int Calc_itm_pad_w(int v) {return v + 8;}			// 8=Gallery Box borders; REF.MW:ImageGallery.php|GB_BORDERS
-	public static int Calc_vpad(int mgr_itm_height, int html_h) {
-		int	min_thumb_height = html_h > 17 ? html_h : 17;						// $minThumbHeight =  $thumb->height > 17 ? $thumb->height : 17;
-		return (int)Math_.Floor((30 + mgr_itm_height - min_thumb_height) / 2);	// $vpad = floor(( self::THUMB_PADDING + $this->mHeights - $minThumbHeight ) /2);
-	}
+class Gallery_xnde_atrs {
+	public static final byte 
+	  Tid__mode			= 0
+	, Tid__perrow		= 1
+	, Tid__widths		= 2
+	, Tid__heights		= 3
+	, Tid__caption		= 4
+	, Tid__showfilename	= 5
+	, Tid__style		= 6
+	, Tid__class		= 7
+	;
+	public static final    Hash_adp_bry Key_hash = Hash_adp_bry.ci_a7()
+	.Add_str_byte("mode"			, Tid__mode)
+	.Add_str_byte("perrow"			, Tid__perrow)
+	.Add_str_byte("widths"			, Tid__widths)
+	.Add_str_byte("heights"			, Tid__heights)
+	.Add_str_byte("caption"			, Tid__caption)
+	.Add_str_byte("showfilename"	, Tid__showfilename)
+	.Add_str_byte("style"			, Tid__style)
+	.Add_str_byte("class"			, Tid__class)
+	;
 }
diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xtn_mgr.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xtn_mgr.java
index 12b83f4f5..b13c042ac 100644
--- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xtn_mgr.java
+++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xtn_mgr.java
@@ -16,15 +16,11 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-import gplx.xowa.htmls.modules.*;
 public class Gallery_xtn_mgr extends Xox_mgr_base {
-	@Override public byte[] Xtn_key() {return XTN_KEY;} public static final    byte[] XTN_KEY = Bry_.new_a7("gallery");
-	@Override public Xox_mgr Xtn_clone_new() {return new Gallery_xtn_mgr();}
-	public Gallery_itm_parser Parser() {return parser;} private Gallery_itm_parser parser;
-	public Gallery_html_wtr Html_wtr() {return html_wtr;} private Gallery_html_wtr html_wtr;
+	@Override public byte[]		Xtn_key() {return XTN_KEY;} public static final    byte[] XTN_KEY = Bry_.new_a7("gallery");
+	@Override public Xox_mgr		Xtn_clone_new() {return new Gallery_xtn_mgr();}
+	public Gallery_parser	Parser() {return parser;} private final    Gallery_parser parser = new Gallery_parser();
 	@Override public void Xtn_init_by_wiki(Xowe_wiki wiki) {
-		parser = new Gallery_itm_parser();
 		parser.Init_by_wiki(wiki);
-		html_wtr = new Gallery_html_wtr();
 	}
 }
diff --git a/400_xowa/src/gplx/xowa/xtns/imaps/Imap_map.java b/400_xowa/src/gplx/xowa/xtns/imaps/Imap_map.java
index 8d38e992a..391c363c2 100644
--- a/400_xowa/src/gplx/xowa/xtns/imaps/Imap_map.java
+++ b/400_xowa/src/gplx/xowa/xtns/imaps/Imap_map.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.xtns.imaps; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*;
-import gplx.xowa.files.*; import gplx.xowa.files.gui.*;
+import gplx.xowa.files.*; import gplx.xowa.guis.cbks.js.*;
 import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.htmls.core.wkrs.imgs.atrs.*; import gplx.xowa.htmls.core.makes.imgs.*; import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*;
 import gplx.xowa.xtns.imaps.itms.*; import gplx.xowa.xtns.imaps.htmls.*;
 public class Imap_map implements Xoh_file_img_wkr, Js_img_wkr {
@@ -51,7 +51,7 @@ public class Imap_map implements Xoh_file_img_wkr, Js_img_wkr {
 	}
 	public void Js_wkr__update_hdoc(Xoa_page page, Xog_js_wkr js_wkr, int html_uid
 		, int html_w, int html_h, Io_url html_view_url
-		, int orig_w, int orig_h, Io_url html_orig_url, byte[] lnki_ttl) {
+		, int orig_w, int orig_h, Xof_ext orig_ext, Io_url html_orig_url, byte[] lnki_ttl) {
 		Bry_bfr tmp_bfr = Bry_bfr_.Get();
 		try {
 			Write_imap_div(tmp_bfr, Xoh_wtr_ctx.Basic, html_uid, html_w, html_h, html_view_url.To_http_file_bry(), orig_w, orig_h, lnki_ttl);
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Dot_tkn.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Dot_tkn.java
new file mode 100644
index 000000000..e7026ded3
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Dot_tkn.java
@@ -0,0 +1,25 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Dot_tkn implements Expr_tkn {
+	public int Tid() {return Expr_tkn_.Tid_number;}		
+	public byte[] Val_ary()	{return Val_Ary;} static final    byte[] Val_Ary = new byte[] {Byte_ascii.Dot};
+	public String Val_str()	{return String_.new_u8(Val_Ary);}
+	public Dot_tkn() {}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Expr_tkn.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Expr_tkn.java
new file mode 100644
index 000000000..eec3bd8f6
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Expr_tkn.java
@@ -0,0 +1,23 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+interface Expr_tkn {
+	int Tid();
+	byte[] Val_ary();
+	String Val_str();
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Expr_tkn_.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Expr_tkn_.java
new file mode 100644
index 000000000..92c7fc5c2
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Expr_tkn_.java
@@ -0,0 +1,22 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Expr_tkn_ {
+	public static final int Tid_operator = 1, Tid_paren_lhs = 5, Tid_paren_rhs = 6, Tid_space = 7, Tid_number = 8;
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn.java
new file mode 100644
index 000000000..a34fa21fc
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn.java
@@ -0,0 +1,26 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+interface Func_tkn extends Expr_tkn {
+	boolean Func_is_const();
+	int ArgCount();
+	int Precedence();
+	Func_tkn GetAlt();
+	boolean Calc(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack);
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_abs.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_abs.java
new file mode 100644
index 000000000..f9e77d78c
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_abs.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_abs extends Func_tkn_base {
+	public Func_tkn_abs(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(val.Abs());
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_acos.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_acos.java
new file mode 100644
index 000000000..5783f5df0
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_acos.java
@@ -0,0 +1,31 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+import gplx.xowa.langs.msgs.*;
+class Func_tkn_acos extends Func_tkn_base {
+	public Func_tkn_acos(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		if (val.Comp_lt(-1) || val.Comp_gt(1)) {shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_invalid_argument, this.Val_ary()); return false;}
+		val_stack.Push(Decimal_adp_.double_(Math_.Acos(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_and.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_and.java
new file mode 100644
index 000000000..74ea0887f
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_and.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_and extends Func_tkn_base {
+	public Func_tkn_and(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 3;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(!lhs.Eq(0) && !rhs.Eq(0) ? Decimal_adp_.One : Decimal_adp_.Zero);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_asin.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_asin.java
new file mode 100644
index 000000000..aa86296b3
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_asin.java
@@ -0,0 +1,31 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+import gplx.xowa.langs.msgs.*;
+class Func_tkn_asin extends Func_tkn_base {
+	public Func_tkn_asin(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		if (val.Comp_lt(-1) || val.Comp_gt(1)) {shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_invalid_argument, this.Val_ary()); return false;}
+		val_stack.Push(Decimal_adp_.double_(Math_.Asin(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_atan.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_atan.java
new file mode 100644
index 000000000..61a058296
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_atan.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_atan extends Func_tkn_base {
+	public Func_tkn_atan(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(Decimal_adp_.double_(Math_.Atan(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_base.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_base.java
new file mode 100644
index 000000000..7469a6dc7
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_base.java
@@ -0,0 +1,35 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+import gplx.xowa.langs.msgs.*;
+abstract class Func_tkn_base implements Func_tkn {
+	public int Tid() {return Expr_tkn_.Tid_operator;}
+	public abstract int Precedence();
+	public abstract int ArgCount();
+	@gplx.Virtual public boolean Func_is_const() {return false;}
+	public void Ctor(String v) {val_ary = Bry_.new_u8(v);}
+	public byte[] Val_ary()	{return val_ary;} private byte[] val_ary;
+	public String Val_str()	{return String_.new_u8(Val_ary());}
+	@gplx.Virtual public Func_tkn GetAlt() {return this;}
+	public boolean Calc(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		if (val_stack.Len() < this.ArgCount()) {shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_missing_operand, Val_ary()); return false;}
+		return Calc_hook(ctx, shunter, val_stack);
+	}
+	public abstract boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack);
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_ceil.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_ceil.java
new file mode 100644
index 000000000..bb005f3ed
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_ceil.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_ceil extends Func_tkn_base {
+	public Func_tkn_ceil(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(Decimal_adp_.double_(Math_.Ceil(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_cos.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_cos.java
new file mode 100644
index 000000000..154f46050
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_cos.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_cos extends Func_tkn_base {
+	public Func_tkn_cos(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(Decimal_adp_.double_(Math_.Cos(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_divide.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_divide.java
new file mode 100644
index 000000000..430650f81
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_divide.java
@@ -0,0 +1,35 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+import gplx.xowa.langs.msgs.*;
+class Func_tkn_divide extends Func_tkn_base {
+	public Func_tkn_divide(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 7;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		if (rhs.Eq(0)) {
+			shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_division_by_zero);
+			return false;
+		}
+		val_stack.Push(lhs.Divide(rhs));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_e_const.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_e_const.java
new file mode 100644
index 000000000..d1b96f12f
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_e_const.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_e_const extends Func_tkn_base {
+	public Func_tkn_e_const(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 0;}
+	@Override public int Precedence()	{return 0;}
+	@Override public boolean Func_is_const() {return true;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		val_stack.Push(Decimal_adp_.Const_e);
+		return true;
+	}
+	public static final    Func_tkn_e_const Instance = new Func_tkn_e_const("e");
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_e_op.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_e_op.java
new file mode 100644
index 000000000..14527674b
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_e_op.java
@@ -0,0 +1,41 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_e_op extends Func_tkn_base {
+	public Func_tkn_e_op(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 9;}	// NOTE: needs to be < than - sign
+	@Override public Func_tkn GetAlt() {return Func_tkn_e_const.Instance;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		int rhs_int = rhs.To_int();
+		if (	rhs_int > 308
+			||	(lhs.To_double() >= 1.8f && rhs_int == 308)) {	// PHP:"maximum of ~1.8e308"; verified with {{#expr:1.8e308}} on sandbox; REF:http://php.net/manual/en/language.types.float.php; PAGE:en.w:Factorial; en.w:Astatine; DATE:2015-04-08; DATE:2015-04-21
+			shunter.Rslt_set(Double_.Inf_pos_bry);
+			return false;
+		}
+		double rhs_double = rhs.To_double();
+		if ((double)rhs_int == rhs_double)	// exponent is integer; use pow_10 which does less casts to double
+			val_stack.Push(lhs.Multiply(Decimal_adp_.pow_10_(rhs_int)));
+		else
+			val_stack.Push(lhs.Multiply(Decimal_adp_.double_thru_str_(Math_.Pow(10d, rhs_double))));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_eq.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_eq.java
new file mode 100644
index 000000000..208d27ed9
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_eq.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_eq extends Func_tkn_base {
+	public Func_tkn_eq(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 4;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Eq(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_exp.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_exp.java
new file mode 100644
index 000000000..1ac89f7ff
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_exp.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_exp extends Func_tkn_base {
+	public Func_tkn_exp(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(Decimal_adp_.double_(Math_.Exp(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_floor.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_floor.java
new file mode 100644
index 000000000..e054bd856
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_floor.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_floor extends Func_tkn_base {
+	public Func_tkn_floor(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(Decimal_adp_.double_(Math_.Floor(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_fmod.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_fmod.java
new file mode 100644
index 000000000..69bd336cd
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_fmod.java
@@ -0,0 +1,34 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*; import gplx.xowa.langs.msgs.*;
+class Func_tkn_fmod extends Func_tkn_base {
+	public Func_tkn_fmod(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 7;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = (Decimal_adp)val_stack.Pop();
+		Decimal_adp lhs = (Decimal_adp)val_stack.Pop();
+		if (rhs.To_double() == 0) {
+			shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_division_by_zero);
+			return false;
+		}
+		val_stack.Push(lhs.Mod(rhs));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_gt.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_gt.java
new file mode 100644
index 000000000..63bcb0883
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_gt.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_gt extends Func_tkn_base {
+	public Func_tkn_gt(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 4;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Comp_gt(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_gte.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_gte.java
new file mode 100644
index 000000000..30af3e0ae
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_gte.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_gte extends Func_tkn_base {
+	public Func_tkn_gte(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 4;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Comp_gte(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_ln.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_ln.java
new file mode 100644
index 000000000..f4a87d800
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_ln.java
@@ -0,0 +1,31 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+import gplx.xowa.langs.msgs.*;
+class Func_tkn_ln extends Func_tkn_base {
+	public Func_tkn_ln(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		if (val.Comp_lte(0)) {shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_invalid_argument_ln); return false;}		
+		val_stack.Push(Decimal_adp_.double_(Math_.Log(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_lt.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_lt.java
new file mode 100644
index 000000000..40c90be51
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_lt.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_lt extends Func_tkn_base {
+	public Func_tkn_lt(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 4;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Comp_lt(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_lte.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_lte.java
new file mode 100644
index 000000000..7709ffff7
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_lte.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_lte extends Func_tkn_base {
+	public Func_tkn_lte(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 4;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Comp_lte(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_minus.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_minus.java
new file mode 100644
index 000000000..de59b72ee
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_minus.java
@@ -0,0 +1,31 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_minus extends Func_tkn_base {
+	public Func_tkn_minus(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 6;}
+	@Override public Func_tkn GetAlt() {return Func_tkn_minus_negative.Instance;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Subtract(rhs));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_minus_negative.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_minus_negative.java
new file mode 100644
index 000000000..6dc15cdde
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_minus_negative.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_minus_negative extends Func_tkn_base {
+	public Func_tkn_minus_negative(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 10;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(val.Multiply(Decimal_adp_.Neg1));
+		return true;
+	}
+	public static final    Func_tkn_minus_negative Instance = new Func_tkn_minus_negative("-");
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_mod.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_mod.java
new file mode 100644
index 000000000..1a48d1491
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_mod.java
@@ -0,0 +1,36 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*; import gplx.xowa.langs.msgs.*;
+class Func_tkn_mod extends Func_tkn_base {
+	public Func_tkn_mod(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 7;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		// must convert to int else issues with {{#expr:0.00999999mod10}} and {{USCensusPop|1960=763956|1970=756510}}; REF: http://php.net/manual/en/language.operators.arithmetic.php: "Operands of modulus are converted to integers (by stripping the decimal part) before processing"
+		// must convert to long else issues with (39052000900/1) mod 100 which should be 0, not 47; JAVA does not fail int conversion, and instead converts to Int_.Max_value; EX: de.w:Quijano_(Piélagos)
+		long rhs = ((Decimal_adp)val_stack.Pop()).To_long();
+		long lhs = ((Decimal_adp)val_stack.Pop()).To_long();
+		if (rhs == 0) {
+			shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_division_by_zero);
+			return false;
+		}
+		val_stack.Push(Decimal_adp_.long_(lhs % rhs));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_neq.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_neq.java
new file mode 100644
index 000000000..e0d241f10
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_neq.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_neq extends Func_tkn_base {
+	public Func_tkn_neq(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 4;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Eq(rhs) ? Decimal_adp_.Zero : Decimal_adp_.One);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_not.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_not.java
new file mode 100644
index 000000000..25039859a
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_not.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_not extends Func_tkn_base {
+	public Func_tkn_not(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(val.Eq(0) ? Decimal_adp_.One : Decimal_adp_.Zero);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_or.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_or.java
new file mode 100644
index 000000000..00aac1c73
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_or.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_or extends Func_tkn_base {
+	public Func_tkn_or(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 2;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(!lhs.Eq(0) || !rhs.Eq(0) ? Decimal_adp_.One : Decimal_adp_.Zero);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_pi.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_pi.java
new file mode 100644
index 000000000..d1f6e6e13
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_pi.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_pi extends Func_tkn_base {
+	public Func_tkn_pi(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 0;}
+	@Override public int Precedence()	{return 0;}
+	@Override public boolean Func_is_const() {return true;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		val_stack.Push(Decimal_adp_.Const_pi);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_plus.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_plus.java
new file mode 100644
index 000000000..39738f82f
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_plus.java
@@ -0,0 +1,32 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_plus extends Func_tkn_base {
+	public Func_tkn_plus(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 6;}
+	@Override public Func_tkn GetAlt() {return Func_tkn_plus_positive.Instance;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Add(rhs));
+		return true;
+	}
+	public static final    Func_tkn_plus Instance = new Func_tkn_plus(); Func_tkn_plus() {}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_plus_positive.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_plus_positive.java
new file mode 100644
index 000000000..e9ee45106
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_plus_positive.java
@@ -0,0 +1,26 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_plus_positive extends Func_tkn_base {
+	Func_tkn_plus_positive(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 10;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {return true;}// effectively a noop
+	public static final    Func_tkn_plus_positive Instance = new Func_tkn_plus_positive("+");
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_pow.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_pow.java
new file mode 100644
index 000000000..fe231943b
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_pow.java
@@ -0,0 +1,41 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_pow extends Func_tkn_base {
+	public Func_tkn_pow(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 8;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		int rhs_int = rhs.To_int();	
+		if ((double)rhs_int == rhs.To_double())	// exponent is integer; use decimal pow which does less casts to double
+			val_stack.Push(lhs.Pow(rhs_int));
+		else {
+			double rslt = Math_.Pow(lhs.To_double(), rhs.To_double());
+			if (Double_.IsNaN(rslt)) {
+				shunter.Rslt_set(Double_.NaN_bry);
+				return false;
+			}
+			else
+				val_stack.Push(Decimal_adp_.double_thru_str_(rslt));
+		}
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_round.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_round.java
new file mode 100644
index 000000000..8236dbba8
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_round.java
@@ -0,0 +1,40 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_round extends Func_tkn_base {
+	public Func_tkn_round(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 5;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		if (rhs.Comp_gt(16)) {
+			rhs = Decimal_adp_.int_(16);
+		}
+		else if (rhs.Comp_lt(-16)) {
+			rhs = Decimal_adp_.int_(-16);
+		}
+		Decimal_adp val = lhs.Round_old(rhs.To_int());
+		if (val.To_double() == 0)	// NOTE: must explicitly check for zero, else "0.0" will be pushed onto stack; EXE: {{#expr: 0 round 1}}; DATE:2013-11-09
+			val_stack.Push(Decimal_adp_.Zero);
+		else
+			val_stack.Push(val);
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_sin.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_sin.java
new file mode 100644
index 000000000..ed0045f52
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_sin.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_sin extends Func_tkn_base {
+	public Func_tkn_sin(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(Decimal_adp_.double_(Math_.Sin(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_sqrt.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_sqrt.java
new file mode 100644
index 000000000..11e1c24bc
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_sqrt.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_sqrt extends Func_tkn_base {
+	public Func_tkn_sqrt(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(val.Sqrt());
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_stack.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_stack.java
new file mode 100644
index 000000000..46774aaae
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_stack.java
@@ -0,0 +1,40 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_stack {
+	public void Clear() {stack_len = 0;}
+	public int Len() {return stack_len;}
+	public Func_tkn GetLast() {return stack_len == 0 ? null : stack[stack_len - 1];}
+	public Func_tkn Pop() {
+		int stack_len_new = stack_len - 1;
+		Func_tkn rv = stack[stack_len_new];
+		stack_len = stack_len_new;
+		return rv;
+	}
+	public void Push(Func_tkn v) {
+		int stack_len_new = stack_len + 1;
+		if (stack_len_new > stack_max) {
+			stack_max = stack_len_new * 2;
+			stack = (Func_tkn[])Array_.Resize(stack, stack_max);
+		}
+		stack[stack_len] = v;
+		stack_len = stack_len_new;
+	}
+	Func_tkn[] stack = new Func_tkn[0]; int stack_len = 0, stack_max = 0;
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_tan.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_tan.java
new file mode 100644
index 000000000..bf7bfc711
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_tan.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_tan extends Func_tkn_base {
+	public Func_tkn_tan(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(Decimal_adp_.double_(Math_.Tan(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_times.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_times.java
new file mode 100644
index 000000000..0ee9c5184
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_times.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_times extends Func_tkn_base {
+	public Func_tkn_times(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 2;}
+	@Override public int Precedence()	{return 7;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp rhs = val_stack.Pop();
+		Decimal_adp lhs = val_stack.Pop();
+		val_stack.Push(lhs.Multiply(rhs));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_trunc.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_trunc.java
new file mode 100644
index 000000000..73116679b
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Func_tkn_trunc.java
@@ -0,0 +1,29 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Func_tkn_trunc extends Func_tkn_base {
+	public Func_tkn_trunc(String v) {this.Ctor(v);}
+	@Override public int ArgCount()		{return 1;}
+	@Override public int Precedence()	{return 9;}
+	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
+		Decimal_adp val = val_stack.Pop();
+		val_stack.Push(Decimal_adp_.double_(Math_.Trunc(val.To_double())));
+		return true;
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Num_tkn.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Num_tkn.java
new file mode 100644
index 000000000..c051996f4
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Num_tkn.java
@@ -0,0 +1,28 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Num_tkn implements Expr_tkn {
+	public int Tid() {return Expr_tkn_.Tid_number;}		
+	public byte[] Val_ary()	{return val_ary;} private byte[] val_ary;
+	public String Val_str()	{return String_.new_u8(val_ary);}
+	public Num_tkn(int val_int) {
+		this.val_int = val_int;
+		this.val_ary = new byte[] {Byte_.By_int(val_int + Byte_ascii.Num_0)};
+	}	int val_int;
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Paren_bgn_tkn.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Paren_bgn_tkn.java
new file mode 100644
index 000000000..c4cc1e0b2
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Paren_bgn_tkn.java
@@ -0,0 +1,30 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Paren_bgn_tkn implements Expr_tkn, Func_tkn {
+	public int Tid() {return Expr_tkn_.Tid_paren_lhs;}
+	public boolean Func_is_const() {return false;}
+	public byte[] Val_ary() {return val_ary;} private byte[] val_ary = Bry_.new_u8(val_str);
+	public String Val_str() {return val_str;} static final    String val_str = "(";
+	public int ArgCount() {return 0;}
+	public int Precedence() {return -1;}
+	public Func_tkn GetAlt() {return this;}
+	public boolean Calc(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {throw Err_.new_unimplemented();}
+	public static Paren_bgn_tkn Instance = new Paren_bgn_tkn(); Paren_bgn_tkn() {}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Paren_end_tkn.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Paren_end_tkn.java
new file mode 100644
index 000000000..0bf9e6029
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Paren_end_tkn.java
@@ -0,0 +1,25 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Paren_end_tkn implements Expr_tkn {
+	public int Tid() {return Expr_tkn_.Tid_paren_rhs;}
+	public byte[] Val_ary() {return val_ary;} private byte[] val_ary = Bry_.new_u8(val_str);
+	public String Val_str() {return val_str;} static final    String val_str = ")";
+	public static Paren_end_tkn Instance = new Paren_end_tkn(); Paren_end_tkn() {}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Pfunc_expr_ops.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Pfunc_expr_ops.java
deleted file mode 100644
index 409225a8f..000000000
--- a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Pfunc_expr_ops.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
-import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*;
-import gplx.xowa.parsers.*;
-interface Expr_tkn {
-	int Tid();
-	byte[] Val_ary();
-	String Val_str();
-}
-class Expr_tkn_ {
-	public static final int Tid_operator = 1, Tid_paren_lhs = 5, Tid_paren_rhs = 6, Tid_space = 7, Tid_number = 8;
-}
-interface Func_tkn extends Expr_tkn {
-	boolean Func_is_const();
-	int ArgCount();
-	int Precedence();
-	Func_tkn GetAlt();
-	boolean Calc(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack);
-}
-class Ws_tkn implements Expr_tkn {
-	public int Tid() {return Expr_tkn_.Tid_space;}
-	public byte[] Val_ary() {return val_ary;} private byte[] val_ary;
-	public String Val_str() {return val_str;} private String val_str;
-	public Ws_tkn(byte b) {this.val_ary = new byte[] {b}; this.val_str = Char_.To_str(Char_.By_int(b));}
-}
-class Paren_bgn_tkn implements Expr_tkn, Func_tkn {
-	public int Tid() {return Expr_tkn_.Tid_paren_lhs;}
-	public boolean Func_is_const() {return false;}
-	public byte[] Val_ary() {return val_ary;} private byte[] val_ary = Bry_.new_u8(val_str);
-	public String Val_str() {return val_str;} static final String val_str = "(";
-	public int ArgCount() {return 0;}
-	public int Precedence() {return -1;}
-	public Func_tkn GetAlt() {return this;}
-	public boolean Calc(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {throw Err_.new_unimplemented();}
-	public static Paren_bgn_tkn Instance = new Paren_bgn_tkn(); Paren_bgn_tkn() {}
-}
-class Paren_end_tkn implements Expr_tkn {
-	public int Tid() {return Expr_tkn_.Tid_paren_rhs;}
-	public byte[] Val_ary() {return val_ary;} private byte[] val_ary = Bry_.new_u8(val_str);
-	public String Val_str() {return val_str;} static final String val_str = ")";
-	public static Paren_end_tkn Instance = new Paren_end_tkn(); Paren_end_tkn() {}
-}
-class Num_tkn implements Expr_tkn {
-	public int Tid() {return Expr_tkn_.Tid_number;}		
-	public byte[] Val_ary()	{return val_ary;} private byte[] val_ary;
-	public String Val_str()	{return String_.new_u8(val_ary);}
-	public Num_tkn(int val_int) {
-		this.val_int = val_int;
-		this.val_ary = new byte[] {Byte_.By_int(val_int + Byte_ascii.Num_0)};
-	}	int val_int;
-}
-class Dot_tkn implements Expr_tkn {
-	public int Tid() {return Expr_tkn_.Tid_number;}		
-	public byte[] Val_ary()	{return Val_Ary;} static final byte[] Val_Ary = new byte[] {Byte_ascii.Dot};
-	public String Val_str()	{return String_.new_u8(Val_Ary);}
-	public Dot_tkn() {}
-}
-class Val_stack {
-	public void Clear() {stack_len = 0;}
-	public int Len() {return stack_len;}
-	public Decimal_adp Pop() {
-		int stack_len_new = stack_len - 1;
-		Decimal_adp rv = stack[stack_len_new];
-		stack_len = stack_len_new;
-		return rv;
-	}
-	public void Push(Decimal_adp v) {
-		int stack_len_new = stack_len + 1;
-		if (stack_len_new > stack_max) {
-			stack_max = stack_len_new * 2;
-			stack = (Decimal_adp[])Array_.Resize(stack, stack_max);
-		}
-		stack[stack_len] = v;
-		stack_len = stack_len_new;
-	}
-	Decimal_adp[] stack = new Decimal_adp[0]; int stack_len = 0, stack_max = 0;
-}
-class Func_tkn_stack {
-	public void Clear() {stack_len = 0;}
-	public int Len() {return stack_len;}
-	public Func_tkn GetLast() {return stack_len == 0 ? null : stack[stack_len - 1];}
-	public Func_tkn Pop() {
-		int stack_len_new = stack_len - 1;
-		Func_tkn rv = stack[stack_len_new];
-		stack_len = stack_len_new;
-		return rv;
-	}
-	public void Push(Func_tkn v) {
-		int stack_len_new = stack_len + 1;
-		if (stack_len_new > stack_max) {
-			stack_max = stack_len_new * 2;
-			stack = (Func_tkn[])Array_.Resize(stack, stack_max);
-		}
-		stack[stack_len] = v;
-		stack_len = stack_len_new;
-	}
-	Func_tkn[] stack = new Func_tkn[0]; int stack_len = 0, stack_max = 0;
-}
-abstract class Func_tkn_base implements Func_tkn {
-	public int Tid() {return Expr_tkn_.Tid_operator;}
-	public abstract int Precedence();
-	public abstract int ArgCount();
-	@gplx.Virtual public boolean Func_is_const() {return false;}
-	public void Ctor(String v) {val_ary = Bry_.new_u8(v);}
-	public byte[] Val_ary()	{return val_ary;} private byte[] val_ary;
-	public String Val_str()	{return String_.new_u8(Val_ary());}
-	@gplx.Virtual public Func_tkn GetAlt() {return this;}
-	public boolean Calc(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		if (val_stack.Len() < this.ArgCount()) {shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_missing_operand, Val_ary()); return false;}
-		return Calc_hook(ctx, shunter, val_stack);
-	}
-	public abstract boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack);
-}
-class Func_tkn_plus extends Func_tkn_base {
-	public Func_tkn_plus(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 6;}
-	@Override public Func_tkn GetAlt() {return Func_tkn_plus_positive.Instance;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Add(rhs));
-		return true;
-	}
-	public static final Func_tkn_plus Instance = new Func_tkn_plus(); Func_tkn_plus() {}
-}
-class Func_tkn_plus_positive extends Func_tkn_base {
-	Func_tkn_plus_positive(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 10;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {return true;}// effectively a noop
-	public static final Func_tkn_plus_positive Instance = new Func_tkn_plus_positive("+");
-}
-class Func_tkn_minus extends Func_tkn_base {
-	public Func_tkn_minus(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 6;}
-	@Override public Func_tkn GetAlt() {return Func_tkn_minus_negative.Instance;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Subtract(rhs));
-		return true;
-	}
-}
-class Func_tkn_minus_negative extends Func_tkn_base {
-	public Func_tkn_minus_negative(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 10;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(val.Multiply(Decimal_adp_.Neg1));
-		return true;
-	}
-	public static final Func_tkn_minus_negative Instance = new Func_tkn_minus_negative("-");
-}
-class Func_tkn_divide extends Func_tkn_base {
-	public Func_tkn_divide(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 7;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		if (rhs.Eq(0)) {
-			shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_division_by_zero);
-			return false;
-		}
-		val_stack.Push(lhs.Divide(rhs));
-		return true;
-	}
-}
-class Func_tkn_times extends Func_tkn_base {
-	public Func_tkn_times(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 7;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Multiply(rhs));
-		return true;
-	}
-}
-class Func_tkn_pow extends Func_tkn_base {
-	public Func_tkn_pow(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 8;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		int rhs_int = rhs.To_int();	
-		if ((double)rhs_int == rhs.To_double())	// exponent is integer; use decimal pow which does less casts to double
-			val_stack.Push(lhs.Pow(rhs_int));
-		else {
-			double rslt = Math_.Pow(lhs.To_double(), rhs.To_double());
-			if (Double_.IsNaN(rslt)) {
-				shunter.Rslt_set(Double_.NaN_bry);
-				return false;
-			}
-			else
-				val_stack.Push(Decimal_adp_.double_thru_str_(rslt));
-		}
-		return true;
-	}
-}
-class Func_tkn_e_op extends Func_tkn_base {
-	public Func_tkn_e_op(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 9;}	// NOTE: needs to be < than - sign
-	@Override public Func_tkn GetAlt() {return Func_tkn_e_const.Instance;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		int rhs_int = rhs.To_int();
-		if (	rhs_int > 308
-			||	(lhs.To_double() >= 1.8f && rhs_int == 308)) {	// PHP:"maximum of ~1.8e308"; verified with {{#expr:1.8e308}} on sandbox; REF:http://php.net/manual/en/language.types.float.php; PAGE:en.w:Factorial; en.w:Astatine; DATE:2015-04-08; DATE:2015-04-21
-			shunter.Rslt_set(Double_.Inf_pos_bry);
-			return false;
-		}
-		double rhs_double = rhs.To_double();
-		if ((double)rhs_int == rhs_double)	// exponent is integer; use pow_10 which does less casts to double
-			val_stack.Push(lhs.Multiply(Decimal_adp_.pow_10_(rhs_int)));
-		else
-			val_stack.Push(lhs.Multiply(Decimal_adp_.double_thru_str_(Math_.Pow(10d, rhs_double))));
-		return true;
-	}
-}
-class Func_tkn_mod extends Func_tkn_base {
-	public Func_tkn_mod(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 7;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		// must convert to int else issues with {{#expr:0.00999999mod10}} and {{USCensusPop|1960=763956|1970=756510}}; REF: http://php.net/manual/en/language.operators.arithmetic.php: "Operands of modulus are converted to integers (by stripping the decimal part) before processing"
-		// must convert to long else issues with (39052000900/1) mod 100 which should be 0, not 47; JAVA does not fail int conversion, and instead converts to Int_.Max_value; EX: de.w:Quijano_(Pi�lagos)
-		long rhs = ((Decimal_adp)val_stack.Pop()).To_long();
-		long lhs = ((Decimal_adp)val_stack.Pop()).To_long();
-		if (rhs == 0) {
-			shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_division_by_zero);
-			return false;
-		}
-		val_stack.Push(Decimal_adp_.long_(lhs % rhs));
-		return true;
-	}
-}
-class Func_tkn_eq extends Func_tkn_base {
-	public Func_tkn_eq(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 4;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Eq(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
-		return true;
-	}
-}
-class Func_tkn_neq extends Func_tkn_base {
-	public Func_tkn_neq(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 4;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Eq(rhs) ? Decimal_adp_.Zero : Decimal_adp_.One);
-		return true;
-	}
-}
-class Func_tkn_gt extends Func_tkn_base {
-	public Func_tkn_gt(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 4;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Comp_gt(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
-		return true;
-	}
-}
-class Func_tkn_lt extends Func_tkn_base {
-	public Func_tkn_lt(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 4;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Comp_lt(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
-		return true;
-	}
-}
-class Func_tkn_gte extends Func_tkn_base {
-	public Func_tkn_gte(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 4;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Comp_gte(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
-		return true;
-	}
-}
-class Func_tkn_lte extends Func_tkn_base {
-	public Func_tkn_lte(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 4;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(lhs.Comp_lte(rhs) ? Decimal_adp_.One : Decimal_adp_.Zero);
-		return true;
-	}
-}
-class Func_tkn_and extends Func_tkn_base {
-	public Func_tkn_and(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 3;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(!lhs.Eq(0) && !rhs.Eq(0) ? Decimal_adp_.One : Decimal_adp_.Zero);
-		return true;
-	}
-}
-class Func_tkn_or extends Func_tkn_base {
-	public Func_tkn_or(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 2;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		val_stack.Push(!lhs.Eq(0) || !rhs.Eq(0) ? Decimal_adp_.One : Decimal_adp_.Zero);
-		return true;
-	}
-}
-class Func_tkn_not extends Func_tkn_base {
-	public Func_tkn_not(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(val.Eq(0) ? Decimal_adp_.One : Decimal_adp_.Zero);
-		return true;
-	}
-}
-class Func_tkn_e_const extends Func_tkn_base {
-	public Func_tkn_e_const(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 0;}
-	@Override public int Precedence()	{return 0;}
-	@Override public boolean Func_is_const() {return true;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		val_stack.Push(Decimal_adp_.Const_e);
-		return true;
-	}
-	public static final Func_tkn_e_const Instance = new Func_tkn_e_const("e");
-}
-class Func_tkn_pi extends Func_tkn_base {
-	public Func_tkn_pi(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 0;}
-	@Override public int Precedence()	{return 0;}
-	@Override public boolean Func_is_const() {return true;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		val_stack.Push(Decimal_adp_.Const_pi);
-		return true;
-	}
-}
-class Func_tkn_ceil extends Func_tkn_base {
-	public Func_tkn_ceil(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(Decimal_adp_.double_(Math_.Ceil(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_trunc extends Func_tkn_base {
-	public Func_tkn_trunc(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(Decimal_adp_.double_(Math_.Trunc(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_floor extends Func_tkn_base {
-	public Func_tkn_floor(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(Decimal_adp_.double_(Math_.Floor(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_abs extends Func_tkn_base {
-	public Func_tkn_abs(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(val.Abs());
-		return true;
-	}
-}
-class Func_tkn_exp extends Func_tkn_base {
-	public Func_tkn_exp(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(Decimal_adp_.double_(Math_.Exp(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_ln extends Func_tkn_base {
-	public Func_tkn_ln(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		if (val.Comp_lte(0)) {shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_invalid_argument_ln); return false;}		
-		val_stack.Push(Decimal_adp_.double_(Math_.Log(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_sin extends Func_tkn_base {
-	public Func_tkn_sin(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(Decimal_adp_.double_(Math_.Sin(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_cos extends Func_tkn_base {
-	public Func_tkn_cos(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(Decimal_adp_.double_(Math_.Cos(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_tan extends Func_tkn_base {
-	public Func_tkn_tan(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(Decimal_adp_.double_(Math_.Tan(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_asin extends Func_tkn_base {
-	public Func_tkn_asin(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		if (val.Comp_lt(-1) || val.Comp_gt(1)) {shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_invalid_argument, this.Val_ary()); return false;}
-		val_stack.Push(Decimal_adp_.double_(Math_.Asin(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_acos extends Func_tkn_base {
-	public Func_tkn_acos(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		if (val.Comp_lt(-1) || val.Comp_gt(1)) {shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_invalid_argument, this.Val_ary()); return false;}
-		val_stack.Push(Decimal_adp_.double_(Math_.Acos(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_atan extends Func_tkn_base {
-	public Func_tkn_atan(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(Decimal_adp_.double_(Math_.Atan(val.To_double())));
-		return true;
-	}
-}
-class Func_tkn_round extends Func_tkn_base {
-	public Func_tkn_round(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 5;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = val_stack.Pop();
-		Decimal_adp lhs = val_stack.Pop();
-		if (rhs.Comp_gt(16)) {
-			rhs = Decimal_adp_.int_(16);
-		}
-		else if (rhs.Comp_lt(-16)) {
-			rhs = Decimal_adp_.int_(-16);
-		}
-		Decimal_adp val = lhs.Round_old(rhs.To_int());
-		if (val.To_double() == 0)	// NOTE: must explicitly check for zero, else "0.0" will be pushed onto stack; EXE: {{#expr: 0 round 1}}; DATE:2013-11-09
-			val_stack.Push(Decimal_adp_.Zero);
-		else
-			val_stack.Push(val);
-		return true;
-	}
-}
-class Func_tkn_fmod extends Func_tkn_base {
-	public Func_tkn_fmod(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 2;}
-	@Override public int Precedence()	{return 7;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp rhs = (Decimal_adp)val_stack.Pop();
-		Decimal_adp lhs = (Decimal_adp)val_stack.Pop();
-		if (rhs.To_double() == 0) {
-			shunter.Err_set(ctx, Xol_msg_itm_.Id_pfunc_expr_division_by_zero);
-			return false;
-		}
-		val_stack.Push(lhs.Mod(rhs));
-		return true;
-	}
-}
-class Func_tkn_sqrt extends Func_tkn_base {
-	public Func_tkn_sqrt(String v) {this.Ctor(v);}
-	@Override public int ArgCount()		{return 1;}
-	@Override public int Precedence()	{return 9;}
-	@Override public boolean Calc_hook(Xop_ctx ctx, Pfunc_expr_shunter shunter, Val_stack val_stack) {
-		Decimal_adp val = val_stack.Pop();
-		val_stack.Push(val.Sqrt());
-		return true;
-	}
-}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Val_stack.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Val_stack.java
new file mode 100644
index 000000000..e7bb72acd
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Val_stack.java
@@ -0,0 +1,39 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Val_stack {
+	public void Clear() {stack_len = 0;}
+	public int Len() {return stack_len;}
+	public Decimal_adp Pop() {
+		int stack_len_new = stack_len - 1;
+		Decimal_adp rv = stack[stack_len_new];
+		stack_len = stack_len_new;
+		return rv;
+	}
+	public void Push(Decimal_adp v) {
+		int stack_len_new = stack_len + 1;
+		if (stack_len_new > stack_max) {
+			stack_max = stack_len_new * 2;
+			stack = (Decimal_adp[])Array_.Resize(stack, stack_max);
+		}
+		stack[stack_len] = v;
+		stack_len = stack_len_new;
+	}
+	Decimal_adp[] stack = new Decimal_adp[0]; int stack_len = 0, stack_max = 0;
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Ws_tkn.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Ws_tkn.java
new file mode 100644
index 000000000..45c28dc7a
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/exprs/Ws_tkn.java
@@ -0,0 +1,25 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.pfuncs.exprs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.*;
+class Ws_tkn implements Expr_tkn {
+	public int Tid() {return Expr_tkn_.Tid_space;}
+	public byte[] Val_ary() {return val_ary;} private byte[] val_ary;
+	public String Val_str() {return val_str;} private String val_str;
+	public Ws_tkn(byte b) {this.val_ary = new byte[] {b}; this.val_str = Char_.To_str(Char_.By_int(b));}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/ttls/Pfunc_anchorencode.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/ttls/Pfunc_anchorencode.java
index ce2b4b7b2..7b411d517 100644
--- a/400_xowa/src/gplx/xowa/xtns/pfuncs/ttls/Pfunc_anchorencode.java
+++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/ttls/Pfunc_anchorencode.java
@@ -57,7 +57,7 @@ public class Pfunc_anchorencode extends Pf_func_base {	// EX: {{anchorencode:a b
 			case Xop_tkn_itm_.Tid_apos: break; // noop
 			case Xop_tkn_itm_.Tid_xnde: Xnde(src, (Xop_xnde_tkn)sub, tmp_bfr); break;
 			case Xop_tkn_itm_.Tid_html_ncr: tmp_bfr.Add_u8_int(((Xop_amp_tkn_num)sub).Val()); break;
-			case Xop_tkn_itm_.Tid_html_ref: tmp_bfr.Add_u8_int(((Xop_amp_tkn_txt)sub).Char_int()); break;
+			case Xop_tkn_itm_.Tid_html_ref: tmp_bfr.Add_u8_int(((Xop_amp_tkn_ent)sub).Char_int()); break;
 			case Xop_tkn_itm_.Tid_tmpl_invk:
 				Xot_invk_tkn invk_tkn = (Xot_invk_tkn)sub;
 				Arg_itm_tkn name_tkn = invk_tkn.Name_tkn().Key_tkn();
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__claim.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__claim_grp.java
similarity index 100%
rename from 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__claim.java
rename to 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__claim_grp.java
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__langtext.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__langtext_tbl.java
similarity index 92%
rename from 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__langtext.java
rename to 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__langtext_tbl.java
index 7c88bbf5e..dfcd486c3 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__langtext.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__langtext_tbl.java
@@ -41,7 +41,7 @@ class Wdata_fmtr__langtext_tbl implements gplx.core.brys.Bfr_arg {
 		if (list_len == 0) return;
 		fmtr.Bld_bfr_many(bfr, toc_data.Href(), toc_data.Text(), col_hdr_lang_name, col_hdr_lang_code, col_hdr_text, toggle_itm.Html_toggle_btn(), toggle_itm.Html_toggle_hdr(), fmtr_row);
 	}
-	private final Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	private final    Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
 	( ""
 	, "  <div class='wikibase-sitelinkgroupview'>"
 	, "    <div class='wikibase-sitelinkgroupview-heading-container'>"
@@ -69,7 +69,7 @@ class Wdata_fmtr__langtext_row_base implements gplx.core.brys.Bfr_arg, Wdata_fmt
 			row_fmtr.Bld_bfr_many(bfr, itm.Lang(), Gfh_utl.Escape_html_as_bry(lang_itm.Canonical_name()), Gfh_utl.Escape_html_as_bry(itm.Text()));
 		}
 	}
-	private final Bry_fmtr row_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	private final    Bry_fmtr row_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
 	( ""
 	, "        <li class='wikibase-sitelinkview'>"
 	, "          <span class='wikibase-sitelinkview-siteid-container'>"
@@ -115,8 +115,8 @@ class Wdata_fmtr__alias_row implements gplx.core.brys.Bfr_arg, Wdata_fmtr__langt
 			}
 		}
 	}
-	private static final byte[] lang_code_style_n = Bry_.new_a7("border:1px solid white;background:none;");
-	private final Bry_fmtr row_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+	private static final    byte[] lang_code_style_n = Bry_.new_a7("border:1px solid white;background:none;");
+	private final    Bry_fmtr row_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
 	( ""
 	, "        <li class='wikibase-sitelinkview'>"
 	, "          <span class='wikibase-sitelinkview-siteid-container' style='~{lang_code_style}>"
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__oview.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__oview_tbl.java
similarity index 100%
rename from 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__oview.java
rename to 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__oview_tbl.java
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__toc.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__toc_div.java
similarity index 70%
rename from 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__toc.java
rename to 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__toc_div.java
index 1311bcb23..c8b6f8540 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__toc.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__toc_div.java
@@ -60,20 +60,3 @@ class Wdata_fmtr__toc_itm implements gplx.core.brys.Bfr_arg {
 	, "      </li>"
 	), "idx", "href", "text");
 }
-class Wdata_toc_data {
-	private final    Wdata_fmtr__toc_div fmtr_toc;
-	private final    Gfo_url_encoder href_encoder;
-	private final    Bry_fmtr text_fmtr = Bry_fmtr.new_("~{orig} <sup><small>(~{len})</small></sup>", "orig", "len");
-	private final    Bry_bfr tmp_bfr = Bry_bfr_.New_w_size(8);
-	public Wdata_toc_data(Wdata_fmtr__toc_div fmtr_toc, Gfo_url_encoder href_encoder) {this.fmtr_toc = fmtr_toc; this.href_encoder = href_encoder;}
-	public Wdata_toc_data Make(int itms_len) {
-		this.text = itms_len_enable ? text_fmtr.Bld_bry_many(tmp_bfr, orig, itms_len) : orig;
-		this.href = href_encoder.Encode(orig);
-		fmtr_toc.Add(this);
-		return this;
-	}
-	public Wdata_toc_data Itms_len_enable_n_() {itms_len_enable = false; return this;} private boolean itms_len_enable = true;
-	public byte[] Orig() {return orig;} public void Orig_(byte[] v) {orig = v;} private byte[] orig;
-	public byte[] Href() {return href;} private byte[] href;
-	public byte[] Text() {return text;} private byte[] text;
-}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_toc_data.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_toc_data.java
new file mode 100644
index 000000000..fcfb6e400
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_toc_data.java
@@ -0,0 +1,37 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.xowa.xtns.wdatas.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.core.brys.fmtrs.*;
+import gplx.langs.htmls.encoders.*;
+class Wdata_toc_data {
+	private final    Wdata_fmtr__toc_div fmtr_toc;
+	private final    Gfo_url_encoder href_encoder;
+	private final    Bry_fmtr text_fmtr = Bry_fmtr.new_("~{orig} <sup><small>(~{len})</small></sup>", "orig", "len");
+	private final    Bry_bfr tmp_bfr = Bry_bfr_.New_w_size(8);
+	public Wdata_toc_data(Wdata_fmtr__toc_div fmtr_toc, Gfo_url_encoder href_encoder) {this.fmtr_toc = fmtr_toc; this.href_encoder = href_encoder;}
+	public Wdata_toc_data Make(int itms_len) {
+		this.text = itms_len_enable ? text_fmtr.Bld_bry_many(tmp_bfr, orig, itms_len) : orig;
+		this.href = href_encoder.Encode(orig);
+		fmtr_toc.Add(this);
+		return this;
+	}
+	public Wdata_toc_data Itms_len_enable_n_() {itms_len_enable = false; return this;} private boolean itms_len_enable = true;
+	public byte[] Orig() {return orig;} public void Orig_(byte[] v) {orig = v;} private byte[] orig;
+	public byte[] Href() {return href;} private byte[] href;
+	public byte[] Text() {return text;} private byte[] text;
+}