From 8bf837bd6f68a8d0fff544341ba5ab21df352b29 Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@pixl8.co.uk>
Date: Sun, 7 Jul 2024 16:24:54 +0200
Subject: [PATCH] fix links and escape special characters

---
 .../activation/ResourceDataSource.java        | 10 +--
 .../collection/AbstractCollection.java        |  8 +-
 .../java/lucee/commons/lang/ParserString.java |  2 +-
 .../java/lucee/runtime/crypt/Cryptor.java     |  2 +-
 core/src/main/java/lucee/runtime/db/QoQ.java  |  2 +-
 .../java/lucee/runtime/engine/InfoImpl.java   | 10 ++-
 .../CFMLExpressionInterpreter.java            |  6 +-
 .../lucee/runtime/net/ftp/AFTPClient.java     |  4 +-
 .../runtime/net/ftp/FTPConnectionImpl.java    |  2 +-
 .../main/java/lucee/runtime/op/Caster.java    |  1 -
 .../java/lucee/runtime/osgi/BundleInfo.java   |  2 +-
 .../java/lucee/runtime/osgi/OSGiUtil.java     |  2 +-
 .../runtime/spooler/SpoolerTaskHTTPCall.java  |  2 +-
 .../main/java/lucee/runtime/tag/Execute.java  |  1 -
 .../main/java/lucee/runtime/tag/_Execute.java |  5 ++
 .../java/lucee/runtime/text/xml/XMLUtil.java  |  2 +-
 .../java/lucee/runtime/type/QueryImpl.java    |  3 -
 .../lucee/runtime/type/StructImplKey.java     |  6 +-
 .../lucee/runtime/type/StructImplString.java  |  6 +-
 .../runtime/type/scope/ScopeSupport.java      |  2 +-
 .../java/lucee/runtime/type/sql/ClobImpl.java |  6 +-
 .../java/lucee/runtime/util/HTTPUtilImpl.java |  2 +-
 .../video/VideoExecuterNotSupported.java      |  9 ---
 .../bytecode/cast/CastBoolean.java            |  4 +-
 .../transformer/bytecode/cast/CastInt.java    |  4 +-
 .../transformer/bytecode/cast/CastNumber.java |  2 +-
 .../transformer/bytecode/cast/CastString.java |  2 +-
 .../bytecode/expression/var/Argument.java     |  2 +-
 .../bytecode/expression/var/VariableRef.java  |  2 +-
 .../bytecode/literal/LitBooleanImpl.java      |  2 +-
 .../bytecode/literal/LitIntegerImpl.java      |  4 +-
 .../bytecode/literal/LitLongImpl.java         |  2 +-
 .../bytecode/literal/LitStringImpl.java       |  2 +-
 .../transformer/bytecode/op/OpBigDecimal.java |  2 +-
 .../lucee/transformer/bytecode/op/OpBool.java |  2 +-
 .../transformer/bytecode/op/OpContional.java  |  2 +-
 .../transformer/bytecode/op/OpNegate.java     |  2 +-
 .../bytecode/reflection/ASMClass.java         | 73 +++----------------
 .../statement/ExpressionAsStatement.java      |  2 +-
 .../bytecode/statement/NativeSwitch.java      |  4 +-
 .../bytecode/statement/PrintOut.java          |  2 +-
 .../bytecode/statement/Switch.java            |  4 +-
 .../bytecode/statement/SystemOut.java         |  2 +-
 .../bytecode/statement/TryCatchFinally.java   |  2 +-
 .../bytecode/statement/tag/TagBreak.java      |  2 +-
 .../bytecode/statement/tag/TagInclude.java    |  2 +-
 .../bytecode/statement/tag/TagJavaScript.java |  2 +-
 .../bytecode/statement/tag/TagLoop.java       |  6 +-
 .../bytecode/statement/tag/TagOutput.java     |  2 +-
 .../bytecode/statement/tag/TagReThrow.java    |  2 +-
 .../bytecode/statement/tag/TagRetry.java      |  2 +-
 .../bytecode/statement/tag/TagReturn.java     |  2 +-
 .../bytecode/statement/tag/TagScript.java     |  2 +-
 .../bytecode/statement/tag/TagSilent.java     |  2 +-
 .../bytecode/statement/tag/TagSwitch.java     |  2 +-
 .../bytecode/statement/tag/TagWhile.java      |  6 +-
 .../bytecode/visitor/DoWhileVisitor.java      |  4 +-
 .../visitor/ForConditionIntVisitor.java       |  4 +-
 .../bytecode/visitor/ForDoubleVisitor.java    |  4 +-
 .../bytecode/visitor/ForIntVisitor.java       |  4 +-
 .../bytecode/visitor/ForVisitor.java          |  4 +-
 .../bytecode/visitor/WhileVisitor.java        |  4 +-
 .../transformer/cfml/ExprTransformer.java     |  4 +-
 .../cfml/evaluator/impl/TreeItem.java         |  4 +-
 .../transformer/cfml/evaluator/impl/Try.java  |  2 +-
 .../expression/AbstrCFMLExprTransformer.java  |  6 +-
 .../transformer/cfml/tag/CFMLTransformer.java | 14 ++--
 .../transformer/library/tag/ImportTagLib.java |  2 +-
 68 files changed, 124 insertions(+), 182 deletions(-)

diff --git a/core/src/main/java/lucee/commons/activation/ResourceDataSource.java b/core/src/main/java/lucee/commons/activation/ResourceDataSource.java
index 73b02d3af8..2789ab969b 100644
--- a/core/src/main/java/lucee/commons/activation/ResourceDataSource.java
+++ b/core/src/main/java/lucee/commons/activation/ResourceDataSource.java
@@ -50,7 +50,7 @@ public ResourceDataSource(Resource res) {
 	/**
 	 * Get name.
 	 * 
-	 * @returns Name
+	 * @return Name of resource
 	 */
 	@Override
 	public String getName() {
@@ -60,7 +60,7 @@ public String getName() {
 	/**
 	 * Get Resource.
 	 * 
-	 * @returns Resource
+	 * @return Resource
 	 */
 	public Resource getResource() {
 		return _file;
@@ -69,7 +69,7 @@ public Resource getResource() {
 	/**
 	 * Get input stream.
 	 * 
-	 * @returns Input stream
+	 * @return Input stream
 	 * @throws IOException IO exception occurred
 	 */
 	@Override
@@ -80,7 +80,7 @@ public InputStream getInputStream() throws IOException {
 	/**
 	 * Get content type.
 	 * 
-	 * @returns Content type
+	 * @return Content type
 	 */
 	@Override
 	public String getContentType() {
@@ -90,7 +90,7 @@ public String getContentType() {
 	/**
 	 * Get output stream.
 	 * 
-	 * @returns Output stream
+	 * @return Output stream
 	 * @throws IOException IO exception occurred
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/commons/collection/AbstractCollection.java b/core/src/main/java/lucee/commons/collection/AbstractCollection.java
index 248631738b..792d9c5ba4 100755
--- a/core/src/main/java/lucee/commons/collection/AbstractCollection.java
+++ b/core/src/main/java/lucee/commons/collection/AbstractCollection.java
@@ -117,15 +117,15 @@ public boolean contains(Object o) {
 	 * <p>
 	 * This method is equivalent to:
 	 *
-	 * <pre>
+	 * <code>
 	 * {
 	 * 	&#64;code
-	 * 	List<E> list = new ArrayList<E>(size());
+	 * 	List&lt;E&gt; list = new ArrayList&lt;E&gt;(size());
 	 * 	for (E e: this)
 	 * 		list.add(e);
 	 * 	return list.toArray();
 	 * }
-	 * </pre>
+	 * </code>
 	 */
 	@Override
 	public Object[] toArray() {
@@ -159,7 +159,7 @@ public Object[] toArray() {
 	 * <pre>
 	 * {
 	 * 	&#64;code
-	 * 	List<E> list = new ArrayList<E>(size());
+	 * 	List&lt;E&gt; list = new ArrayList&lt;E&gt;(size());
 	 * 	for (E e: this)
 	 * 		list.add(e);
 	 * 	return list.toArray(a);
diff --git a/core/src/main/java/lucee/commons/lang/ParserString.java b/core/src/main/java/lucee/commons/lang/ParserString.java
index ba929aa8ed..70527f49c6 100644
--- a/core/src/main/java/lucee/commons/lang/ParserString.java
+++ b/core/src/main/java/lucee/commons/lang/ParserString.java
@@ -315,7 +315,7 @@ public boolean isPreviousPreviousWhiteSpace() {
 	}
 
 	/**
-	 * Gibt zurueck ob das aktuelle Zeichen ein Special Buchstabe ist (_,<euro>,$,<pound>).
+	 * Gibt zurueck ob das aktuelle Zeichen ein Special Buchstabe ist (_,&euro;,$,&pound;).
 	 * 
 	 * @return Gibt zurueck ob das aktuelle Zeichen ein Buchstabe ist.
 	 */
diff --git a/core/src/main/java/lucee/runtime/crypt/Cryptor.java b/core/src/main/java/lucee/runtime/crypt/Cryptor.java
index db997d9f4e..b722aef94b 100644
--- a/core/src/main/java/lucee/runtime/crypt/Cryptor.java
+++ b/core/src/main/java/lucee/runtime/crypt/Cryptor.java
@@ -36,7 +36,7 @@
 import lucee.runtime.op.Caster;
 
 /**
- *
+ * Cryptor
  */
 public class Cryptor {
 
diff --git a/core/src/main/java/lucee/runtime/db/QoQ.java b/core/src/main/java/lucee/runtime/db/QoQ.java
index 1dedfc1fbd..31ca2c2c91 100644
--- a/core/src/main/java/lucee/runtime/db/QoQ.java
+++ b/core/src/main/java/lucee/runtime/db/QoQ.java
@@ -73,7 +73,7 @@
 import lucee.runtime.util.DBUtilImpl;
 
 /**
- *
+ * Query of Queries (QoQ)
  */
 public final class QoQ {
 	final static private Collection.Key paramKey = new KeyImpl("?");
diff --git a/core/src/main/java/lucee/runtime/engine/InfoImpl.java b/core/src/main/java/lucee/runtime/engine/InfoImpl.java
index 2d5459e3fd..9db8ab4960 100644
--- a/core/src/main/java/lucee/runtime/engine/InfoImpl.java
+++ b/core/src/main/java/lucee/runtime/engine/InfoImpl.java
@@ -305,16 +305,18 @@ public List<ExtensionDefintion> getRequiredExtension() {
 		return requiredExtensions;
 	}
 
-	/**
+	/* 
+	 * *
 	 * @return returns the state
 	 * 
-	 * @Override public int getStateAsInt() { return state; }
+	 * Override public int getStateAsInt() { return state; }
 	 */
 
-	/**
+	/*
+	 * *
 	 * @return returns the state
 	 * 
-	 * @Override public String getStateAsString() { return strState; }
+	 * Override public String getStateAsString() { return strState; }
 	 */
 
 	/*
diff --git a/core/src/main/java/lucee/runtime/interpreter/CFMLExpressionInterpreter.java b/core/src/main/java/lucee/runtime/interpreter/CFMLExpressionInterpreter.java
index e7834ccc09..48b9e63b8f 100755
--- a/core/src/main/java/lucee/runtime/interpreter/CFMLExpressionInterpreter.java
+++ b/core/src/main/java/lucee/runtime/interpreter/CFMLExpressionInterpreter.java
@@ -112,14 +112,14 @@
     xorOp          = orOp {"xor" spaces  orOp};
     orOp           = andOp {("or" | "||") spaces andOp}; 
             (* "||" Existiert in CFMX nicht *)
-    andOp          = notOp {("and" | "&&") spaces notOp}; 
-            (* "&&" Existiert in CFMX nicht *) 
+    andOp          = notOp {("and" | "&amp;&amp;") spaces notOp}; 
+            (* "&amp;&amp;" Existiert in CFMX nicht *) 
     notOp          = [("not"|"!") spaces] decsionOp; 
             (* "!" Existiert in CFMX nicht *)
     decsionOp      = concatOp {("neq"|"eq"|"gte"|"gt"|"lte"|"lt"|"ct"|
                      "contains"|"nct"|"does not contain") spaces concatOp}; 
             (* "ct"=conatains und "nct"=does not contain; Existiert in CFMX nicht *)
-    concatOp       = plusMinusOp {"&" spaces plusMinusOp};
+    concatOp       = plusMinusOp {"&amp;" spaces plusMinusOp};
     plusMinusOp    = modOp {("-"|"+") spaces modOp};
     
     modOp          = divMultiOp {("mod" | "%") spaces divMultiOp}; 
diff --git a/core/src/main/java/lucee/runtime/net/ftp/AFTPClient.java b/core/src/main/java/lucee/runtime/net/ftp/AFTPClient.java
index 6491554cad..b8ca0a47b6 100644
--- a/core/src/main/java/lucee/runtime/net/ftp/AFTPClient.java
+++ b/core/src/main/java/lucee/runtime/net/ftp/AFTPClient.java
@@ -171,7 +171,7 @@ public static AFTPClient getInstance(String secure, InetAddress host, int port,
 	 * NOT close the given OutputStream. If the current file type is ASCII, line separators in the file
 	 * are converted to the local representation.
 	 * <p>
-	 * Note: if you have used {@link #setRestartOffset(long)}, the file data will start from the
+	 * Note: if you have used setRestartOffset(long), the file data will start from the
 	 * selected offset.
 	 * 
 	 * @param remote The name of the remote file.
@@ -327,7 +327,7 @@ public static AFTPClient getInstance(String secure, InetAddress host, int port,
 
 	/**
 	 * Opens a Socket connected to a remote host at the specified port and originating from the current
-	 * host at a system assigned port. Before returning, {@link #_connectAction_ _connectAction_() } is
+	 * host at a system assigned port. Before returning, connectAction is
 	 * called to perform connection initialization actions.
 	 * <p>
 	 * 
diff --git a/core/src/main/java/lucee/runtime/net/ftp/FTPConnectionImpl.java b/core/src/main/java/lucee/runtime/net/ftp/FTPConnectionImpl.java
index 702799bc87..898e651796 100755
--- a/core/src/main/java/lucee/runtime/net/ftp/FTPConnectionImpl.java
+++ b/core/src/main/java/lucee/runtime/net/ftp/FTPConnectionImpl.java
@@ -20,7 +20,7 @@
 package lucee.runtime.net.ftp;
 
 /**
- *  
+ *  Creates a FTP Connection
  */
 public final class FTPConnectionImpl implements FTPConnection {
 
diff --git a/core/src/main/java/lucee/runtime/op/Caster.java b/core/src/main/java/lucee/runtime/op/Caster.java
index b04199407e..5cd2665346 100755
--- a/core/src/main/java/lucee/runtime/op/Caster.java
+++ b/core/src/main/java/lucee/runtime/op/Caster.java
@@ -3301,7 +3301,6 @@ public static QueryColumn toQueryColumn(Object o, QueryColumn defaultValue) {
 	 * @param pc
 	 * @return
 	 * @throws PageException
-	 * @info used in bytecode generation
 	 */
 	public static QueryColumn toQueryColumn(Object o, PageContext pc) throws PageException {
 		if (o instanceof QueryColumn) return (QueryColumn) o;
diff --git a/core/src/main/java/lucee/runtime/osgi/BundleInfo.java b/core/src/main/java/lucee/runtime/osgi/BundleInfo.java
index 32290428ae..30a41c943d 100644
--- a/core/src/main/java/lucee/runtime/osgi/BundleInfo.java
+++ b/core/src/main/java/lucee/runtime/osgi/BundleInfo.java
@@ -264,7 +264,7 @@ public Object info() {
 	}
 
 	/**
-	 * Value can be a string (for a Single entry or a List<String> for multiple entries)
+	 * Value can be a string (for a Single entry or a List&lt;String&gt; for multiple entries)
 	 * 
 	 * @return
 	 */
diff --git a/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java b/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
index f0876281b9..c18b49be18 100644
--- a/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
+++ b/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
@@ -2199,7 +2199,7 @@ public static String toState(int state, String defaultValue) {
 	}
 
 	/**
-	 * value can be a String (for a single entry) or a List<String> for multiple entries
+	 * value can be a String (for a single entry) or a List&lt;String&gt; for multiple entries
 	 *
 	 * @param b
 	 * @return
diff --git a/core/src/main/java/lucee/runtime/spooler/SpoolerTaskHTTPCall.java b/core/src/main/java/lucee/runtime/spooler/SpoolerTaskHTTPCall.java
index 9bab4d183c..da8c89753c 100644
--- a/core/src/main/java/lucee/runtime/spooler/SpoolerTaskHTTPCall.java
+++ b/core/src/main/java/lucee/runtime/spooler/SpoolerTaskHTTPCall.java
@@ -57,7 +57,7 @@ public SpoolerTaskHTTPCall(ExecutionPlan[] plans, RemoteClient client) {
 
 	/**
 	 * @return
-	 * @see lucee.runtime.spooler.SpoolerTask#execute()
+	 * @see lucee.runtime.spooler.SpoolerTask#execute(Config)
 	 */
 	@Override
 	public final Object execute(Config config) throws PageException {
diff --git a/core/src/main/java/lucee/runtime/tag/Execute.java b/core/src/main/java/lucee/runtime/tag/Execute.java
index 7e3054d8b8..ae25916312 100755
--- a/core/src/main/java/lucee/runtime/tag/Execute.java
+++ b/core/src/main/java/lucee/runtime/tag/Execute.java
@@ -168,7 +168,6 @@ public void setErrorvariable(String errorVariable) throws PageException {
 	 * the output is displayed on the page from which it was called.
 	 * 
 	 * @param outputfile value to set
-	 * @throws SecurityException
 	 **/
 	public void setOutputfile(String outputfile) {
 		try {
diff --git a/core/src/main/java/lucee/runtime/tag/_Execute.java b/core/src/main/java/lucee/runtime/tag/_Execute.java
index 072c075774..63182aa743 100755
--- a/core/src/main/java/lucee/runtime/tag/_Execute.java
+++ b/core/src/main/java/lucee/runtime/tag/_Execute.java
@@ -27,6 +27,9 @@
 import lucee.commons.lang.PageContextThread;
 import lucee.runtime.PageContext;
 
+/*
+ * Execute external processes
+ */
 public final class _Execute extends PageContextThread {
 
 	private Resource outputfile;
@@ -45,6 +48,8 @@ public final class _Execute extends PageContextThread {
 	private String directory;
 
 	/**
+	 * Constructor: Execute external processes
+	 * 
 	 * @param pageContext
 	 * @param monitor
 	 * @param commands
diff --git a/core/src/main/java/lucee/runtime/text/xml/XMLUtil.java b/core/src/main/java/lucee/runtime/text/xml/XMLUtil.java
index c1650afb77..c3914654f2 100755
--- a/core/src/main/java/lucee/runtime/text/xml/XMLUtil.java
+++ b/core/src/main/java/lucee/runtime/text/xml/XMLUtil.java
@@ -98,7 +98,7 @@
 import lucee.runtime.type.util.StructUtil;
 
 /**
- *
+ * Utils for XML
  */
 public final class XMLUtil {
 
diff --git a/core/src/main/java/lucee/runtime/type/QueryImpl.java b/core/src/main/java/lucee/runtime/type/QueryImpl.java
index 5d4c234a4d..917fcc4c3e 100755
--- a/core/src/main/java/lucee/runtime/type/QueryImpl.java
+++ b/core/src/main/java/lucee/runtime/type/QueryImpl.java
@@ -115,9 +115,6 @@
 /**
  * implementation of the query interface
  */
-/**
- *
- */
 public class QueryImpl implements Query, Objects, QueryResult {
 
 	private static final long serialVersionUID = 1035795427320192551L; // do not chnage
diff --git a/core/src/main/java/lucee/runtime/type/StructImplKey.java b/core/src/main/java/lucee/runtime/type/StructImplKey.java
index f77a0e6269..2cc08bc901 100755
--- a/core/src/main/java/lucee/runtime/type/StructImplKey.java
+++ b/core/src/main/java/lucee/runtime/type/StructImplKey.java
@@ -165,7 +165,7 @@ public void clear() {
 
 	/**
 	 *
-	 * @see lucee.runtime.dump.Dumpable#toDumpData(lucee.runtime.PageContext, int)
+	 * @see lucee.runtime.dump.Dumpable#toDumpData(lucee.runtime.PageContext, int, DumpProperties)
 	 */
 	@Override
 	public DumpData toDumpData(PageContext pageContext, int maxlevel, DumpProperties dp) {
@@ -238,7 +238,7 @@ public Iterator<Entry<Key, Object>> entryIterator() {
 	}
 
 	/**
-	 * @see lucee.runtime.type.Iteratorable#iterator()
+	 * @see lucee.runtime.type.Iteratorable#valueIterator()
 	 */
 	@Override
 	public Iterator valueIterator() {
@@ -320,7 +320,7 @@ public DateTime castToDateTime(DateTime defaultValue) {
 	}
 
 	/**
-	 * @see lucee.runtime.op.Castable#compare(boolean)
+	 * @see lucee.runtime.op.Castable#compareTo(boolean)
 	 */
 	@Override
 	public int compareTo(boolean b) throws ExpressionException {
diff --git a/core/src/main/java/lucee/runtime/type/StructImplString.java b/core/src/main/java/lucee/runtime/type/StructImplString.java
index c6cd39fb1e..fd2dc40912 100755
--- a/core/src/main/java/lucee/runtime/type/StructImplString.java
+++ b/core/src/main/java/lucee/runtime/type/StructImplString.java
@@ -159,7 +159,7 @@ public void clear() {
 
 	/**
 	 *
-	 * @see lucee.runtime.dump.Dumpable#toDumpData(lucee.runtime.PageContext, int)
+	 * @see lucee.runtime.dump.Dumpable#toDumpData(lucee.runtime.PageContext, int, DumpProperties)
 	 */
 	@Override
 	public DumpData toDumpData(PageContext pageContext, int maxlevel, DumpProperties dp) {
@@ -211,7 +211,7 @@ public Iterator<Collection.Key> keyIterator() {
 	}
 
 	/**
-	 * @see lucee.runtime.type.Iteratorable#iterator()
+	 * @see lucee.runtime.type.Iteratorable#valueIterator()
 	 */
 	@Override
 	public Iterator valueIterator() {
@@ -293,7 +293,7 @@ public DateTime castToDateTime(DateTime defaultValue) {
 	}
 
 	/**
-	 * @see lucee.runtime.op.Castable#compare(boolean)
+	 * @see lucee.runtime.op.Castable#compareTo(boolean)
 	 */
 	@Override
 	public int compareTo(boolean b) throws ExpressionException {
diff --git a/core/src/main/java/lucee/runtime/type/scope/ScopeSupport.java b/core/src/main/java/lucee/runtime/type/scope/ScopeSupport.java
index a5039ac9a2..babedf0000 100755
--- a/core/src/main/java/lucee/runtime/type/scope/ScopeSupport.java
+++ b/core/src/main/java/lucee/runtime/type/scope/ScopeSupport.java
@@ -98,7 +98,7 @@ protected ExpressionException invalidKey(String key) {
 	}
 
 	/**
-	 * write parameter defined in a query string (name1=value1&name2=value2) to the scope
+	 * write parameter defined in a query string (name1=value1&amp;name2=value2) to the scope
 	 * 
 	 * @param str Query String
 	 * @return parsed name value pair
diff --git a/core/src/main/java/lucee/runtime/type/sql/ClobImpl.java b/core/src/main/java/lucee/runtime/type/sql/ClobImpl.java
index 6efc52ac47..ec9812fbb6 100755
--- a/core/src/main/java/lucee/runtime/type/sql/ClobImpl.java
+++ b/core/src/main/java/lucee/runtime/type/sql/ClobImpl.java
@@ -45,8 +45,8 @@
  * the data itself. A <code>Clob</code> object is valid for the duration of the transaction in which
  * is was created.
  * <p>
- * Methods in the interfaces {@link DriverResultSet},{@link CallableStatement}, and
- * {@link PreparedStatement}, such as <code>getClob</code> and <code>setClob</code> allow a
+ * Methods in the interfaces  DriverResultSet,{@link java.sql.CallableStatement}, and
+ * {@link java.sql.PreparedStatement}, such as <code>getClob</code> and <code>setClob</code> allow a
  * programmer to access an SQL <code>CLOB</code> value. The <code>Clob</code> interface provides
  * methods for getting the length of an SQL <code>CLOB</code> (Character Large Object) value, for
  * materializing a <code>CLOB</code> value on the client, and for determining the position of a
@@ -117,7 +117,7 @@ public java.io.InputStream getAsciiStream() throws SQLException {
 	}
 
 	/**
-	 * Materializes the <code>CLOB</code> value designated by this <code>object
+	 * Materializes the <code>CLOB</code> value designated by this <code>object</code>
 	 * as a stream of Unicode character.
 	 * 
 	 * &#64;return A reader object with all the data in the <code>CLOB</code> value designated by this
diff --git a/core/src/main/java/lucee/runtime/util/HTTPUtilImpl.java b/core/src/main/java/lucee/runtime/util/HTTPUtilImpl.java
index c9719c6d24..7fc71593e6 100755
--- a/core/src/main/java/lucee/runtime/util/HTTPUtilImpl.java
+++ b/core/src/main/java/lucee/runtime/util/HTTPUtilImpl.java
@@ -145,7 +145,7 @@ public URL toURL(String strUrl, int port, boolean encodeIfNecessary) throws Malf
 	}
 
 	/**
-	 * @see lucee.commons.net.HTTPUtil#toURL(java.lang.String)
+	 * @see lucee.commons.net.HTTPUtil#toURL(java.lang.String, short)
 	 */
 	@Override
 	public URL toURL(String strUrl) throws MalformedURLException {
diff --git a/core/src/main/java/lucee/runtime/video/VideoExecuterNotSupported.java b/core/src/main/java/lucee/runtime/video/VideoExecuterNotSupported.java
index 860443baac..73ba84a016 100644
--- a/core/src/main/java/lucee/runtime/video/VideoExecuterNotSupported.java
+++ b/core/src/main/java/lucee/runtime/video/VideoExecuterNotSupported.java
@@ -26,20 +26,11 @@
 
 public class VideoExecuterNotSupported implements VideoExecuter {
 
-	/**
-	 * @see lucee.runtime.video.VideoExecuter#convertRaw(lucee.runtime.config.ConfigWeb,
-	 *      lucee.runtime.video.VideoInput[], lucee.runtime.video.VideoOutput,
-	 *      lucee.runtime.video.VideoProfile)
-	 */
 	@Override
 	public VideoInfo[] convert(ConfigWeb config, VideoInput[] inputs, VideoOutput output, VideoProfile quality) throws IOException {
 		throw notSupported();
 	}
 
-	/**
-	 * @see lucee.runtime.video.VideoExecuter#infoRaw(lucee.runtime.config.ConfigWeb,
-	 *      lucee.runtime.video.VideoInput)
-	 */
 	@Override
 	public VideoInfo info(ConfigWeb config, VideoInput input) throws IOException {
 		throw notSupported();
diff --git a/core/src/main/java/lucee/transformer/bytecode/cast/CastBoolean.java b/core/src/main/java/lucee/transformer/bytecode/cast/CastBoolean.java
index 52bd9af964..90842801f5 100755
--- a/core/src/main/java/lucee/transformer/bytecode/cast/CastBoolean.java
+++ b/core/src/main/java/lucee/transformer/bytecode/cast/CastBoolean.java
@@ -77,8 +77,8 @@ public static ExprBoolean toExprBoolean(Expression expr) {
 	}
 
 	/**
-	 * @see lucee.transformer.expression.Expression#writeOut(org.objectweb.asm.commons.GeneratorAdapter,
-	 *      int)
+	 * @see lucee.transformer.expression.Expression#writeOut(lucee.transformer.Context,int)
+	 * 
 	 */
 	@Override
 	public Type _writeOut(BytecodeContext bc, int mode) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/cast/CastInt.java b/core/src/main/java/lucee/transformer/bytecode/cast/CastInt.java
index a5505b0711..9c41fb4cd8 100644
--- a/core/src/main/java/lucee/transformer/bytecode/cast/CastInt.java
+++ b/core/src/main/java/lucee/transformer/bytecode/cast/CastInt.java
@@ -62,8 +62,8 @@ public static ExprInt toExprInt(Expression expr) {
 	}
 
 	/**
-	 * @see lucee.transformer.expression.Expression#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
-	 *      int)
+	 * @see lucee.transformer.expression.Expression#writeOut(BytecodeContext,int)
+	 * 
 	 */
 	@Override
 	public Type _writeOut(BytecodeContext bc, int mode) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/cast/CastNumber.java b/core/src/main/java/lucee/transformer/bytecode/cast/CastNumber.java
index efbe325142..ee13f4ef83 100644
--- a/core/src/main/java/lucee/transformer/bytecode/cast/CastNumber.java
+++ b/core/src/main/java/lucee/transformer/bytecode/cast/CastNumber.java
@@ -68,7 +68,7 @@ public static ExprNumber toExprNumber(Expression expr) {
 	}
 
 	/**
-	 * @see lucee.transformer.expression.Expression#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * lucee.transformer.expression.Expression#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/cast/CastString.java b/core/src/main/java/lucee/transformer/bytecode/cast/CastString.java
index 08cec6a39f..65950cd252 100755
--- a/core/src/main/java/lucee/transformer/bytecode/cast/CastString.java
+++ b/core/src/main/java/lucee/transformer/bytecode/cast/CastString.java
@@ -63,7 +63,7 @@ public static ExprString toExprString(Expression expr) {
 	}
 
 	/**
-	 * @see lucee.transformer.expression.Expression#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * lucee.transformer.expression.Expression#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/expression/var/Argument.java b/core/src/main/java/lucee/transformer/bytecode/expression/var/Argument.java
index 6a57cf797f..5c17f7c1f7 100755
--- a/core/src/main/java/lucee/transformer/bytecode/expression/var/Argument.java
+++ b/core/src/main/java/lucee/transformer/bytecode/expression/var/Argument.java
@@ -60,7 +60,7 @@ public void setValue(Expression value, String type) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/expression/var/VariableRef.java b/core/src/main/java/lucee/transformer/bytecode/expression/var/VariableRef.java
index a04c421b14..6d788cd944 100755
--- a/core/src/main/java/lucee/transformer/bytecode/expression/var/VariableRef.java
+++ b/core/src/main/java/lucee/transformer/bytecode/expression/var/VariableRef.java
@@ -50,7 +50,7 @@ public VariableRef(Variable variable, boolean alwaysLocal) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/literal/LitBooleanImpl.java b/core/src/main/java/lucee/transformer/bytecode/literal/LitBooleanImpl.java
index 931d2442f9..b4c6e369c6 100644
--- a/core/src/main/java/lucee/transformer/bytecode/literal/LitBooleanImpl.java
+++ b/core/src/main/java/lucee/transformer/bytecode/literal/LitBooleanImpl.java
@@ -106,7 +106,7 @@ public boolean getBooleanValue() {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/literal/LitIntegerImpl.java b/core/src/main/java/lucee/transformer/bytecode/literal/LitIntegerImpl.java
index 9e2eec8517..353884e82c 100644
--- a/core/src/main/java/lucee/transformer/bytecode/literal/LitIntegerImpl.java
+++ b/core/src/main/java/lucee/transformer/bytecode/literal/LitIntegerImpl.java
@@ -99,8 +99,8 @@ public boolean getBooleanValue() {
 	}
 
 	/**
-	 * @see lucee.transformer.expression.Expression#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
-	 *      int)
+	 * lucee.transformer.expression.Expression#_writeOut(lucee.transformer.bytecode.BytecodeContext,int)
+	 * 
 	 */
 	@Override
 	public Type _writeOut(BytecodeContext bc, int mode) {
diff --git a/core/src/main/java/lucee/transformer/bytecode/literal/LitLongImpl.java b/core/src/main/java/lucee/transformer/bytecode/literal/LitLongImpl.java
index e895337a04..04d481d6f7 100644
--- a/core/src/main/java/lucee/transformer/bytecode/literal/LitLongImpl.java
+++ b/core/src/main/java/lucee/transformer/bytecode/literal/LitLongImpl.java
@@ -89,7 +89,7 @@ public boolean getBooleanValue() {
 	}
 
 	/**
-	 * @see lucee.transformer.expression.Expression#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * lucee.transformer.expression.Expression#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/literal/LitStringImpl.java b/core/src/main/java/lucee/transformer/bytecode/literal/LitStringImpl.java
index ff6d922e0a..ae89414d49 100644
--- a/core/src/main/java/lucee/transformer/bytecode/literal/LitStringImpl.java
+++ b/core/src/main/java/lucee/transformer/bytecode/literal/LitStringImpl.java
@@ -79,7 +79,7 @@ public String getString() {
 	}
 
 	/**
-	 * @see lucee.transformer.expression.Expression#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * lucee.transformer.expression.Expression#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	private static Type _writeOut(BytecodeContext bc, int mode, String str) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/op/OpBigDecimal.java b/core/src/main/java/lucee/transformer/bytecode/op/OpBigDecimal.java
index 10fbcc099c..cb0f2140ba 100644
--- a/core/src/main/java/lucee/transformer/bytecode/op/OpBigDecimal.java
+++ b/core/src/main/java/lucee/transformer/bytecode/op/OpBigDecimal.java
@@ -54,7 +54,7 @@ public OpBigDecimal(Expression left, Expression right, int operation) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/op/OpBool.java b/core/src/main/java/lucee/transformer/bytecode/op/OpBool.java
index 8768c5a922..d5cb03960e 100755
--- a/core/src/main/java/lucee/transformer/bytecode/op/OpBool.java
+++ b/core/src/main/java/lucee/transformer/bytecode/op/OpBool.java
@@ -43,7 +43,7 @@ public final class OpBool extends ExpressionBase implements ExprBoolean {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/op/OpContional.java b/core/src/main/java/lucee/transformer/bytecode/op/OpContional.java
index 6e21b2ec1c..6f1041d40a 100755
--- a/core/src/main/java/lucee/transformer/bytecode/op/OpContional.java
+++ b/core/src/main/java/lucee/transformer/bytecode/op/OpContional.java
@@ -38,7 +38,7 @@ public final class OpContional extends ExpressionBase {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/op/OpNegate.java b/core/src/main/java/lucee/transformer/bytecode/op/OpNegate.java
index 76b67f9c38..8e81705089 100755
--- a/core/src/main/java/lucee/transformer/bytecode/op/OpNegate.java
+++ b/core/src/main/java/lucee/transformer/bytecode/op/OpNegate.java
@@ -64,7 +64,7 @@ public static ExprBoolean toExprBoolean(Expression expr, Position start, Positio
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter,
+	 * @see lucee.transformer.bytecode.expression.ExpressionBase#_writeOut(lucee.transformer.bytecode.BytecodeContext,
 	 *      int)
 	 */
 	@Override
diff --git a/core/src/main/java/lucee/transformer/bytecode/reflection/ASMClass.java b/core/src/main/java/lucee/transformer/bytecode/reflection/ASMClass.java
index 33dd8a98f2..9146076826 100644
--- a/core/src/main/java/lucee/transformer/bytecode/reflection/ASMClass.java
+++ b/core/src/main/java/lucee/transformer/bytecode/reflection/ASMClass.java
@@ -75,9 +75,6 @@ public String toString() {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.PUBLIC)} denies creation of new instances of this
-	 *                class
 	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
@@ -162,7 +159,8 @@ public boolean isPrimitive() {
 	 * depth of the array nesting. The encoding of element type names is as follows:
 	 *
 	 * <blockquote>
-	 * <table summary="Element types and encodings">
+	 * <table>
+	 * <caption>Element types and encodings</caption>
 	 * <tr>
 	 * <th>Element Type
 	 * <th>&nbsp;&nbsp;&nbsp;
@@ -170,39 +168,39 @@ public boolean isPrimitive() {
 	 * <tr>
 	 * <td>boolean
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>Z
+	 * <td>Z
 	 * <tr>
 	 * <td>byte
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>B
+	 * <td>B
 	 * <tr>
 	 * <td>char
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>C
+	 * <td>C
 	 * <tr>
 	 * <td>class or interface
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>L<i>classname</i>;
+	 * <td>L<i>classname</i>;
 	 * <tr>
 	 * <td>double
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>D
+	 * <td>D
 	 * <tr>
 	 * <td>float
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>F
+	 * <td>F
 	 * <tr>
 	 * <td>int
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>I
+	 * <td>I
 	 * <tr>
 	 * <td>long
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>J
+	 * <td>J
 	 * <tr>
 	 * <td>short
 	 * <td>&nbsp;&nbsp;&nbsp;
-	 * <td align=center>S
+	 * <td>S
 	 * </table>
 	 * </blockquote>
 	 *
@@ -422,9 +420,6 @@ public Class getDeclaringClass() {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.PUBLIC)} method denies access to the classes
-	 *                within this class
 	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
@@ -465,10 +460,6 @@ public Class[] getClasses() {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.PUBLIC)} denies access to the fields within this
-	 *                class
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -507,9 +498,6 @@ public Field[] getFields() throws SecurityException {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.PUBLIC)} denies access to the methods within this
-	 *                class
 	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
@@ -546,10 +534,6 @@ public ASMMethod[] getMethods() throws SecurityException {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.PUBLIC)} denies access to the constructors within
-	 *                this class
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -594,9 +578,6 @@ public Constructor[] getConstructors() throws SecurityException {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.PUBLIC)} denies access to the field
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -659,9 +640,6 @@ public Field getField(String name) throws NoSuchFieldException, SecurityExceptio
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.PUBLIC)} denies access to the method
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -698,9 +676,6 @@ public Method getMethod(String name, Class... parameterTypes) throws NoSuchMetho
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.PUBLIC)} denies access to the constructor
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -729,10 +704,6 @@ public Constructor getConstructor(Class... parameterTypes) throws NoSuchMethodEx
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.DECLARED)} denies access to the declared classes
-	 *                within this class
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -764,10 +735,6 @@ public Class[] getDeclaredClasses() throws SecurityException {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.DECLARED)} denies access to the declared fields
-	 *                within this class
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -801,10 +768,6 @@ public Field[] getDeclaredFields() throws SecurityException {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.DECLARED)} denies access to the declared methods
-	 *                within this class
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -837,10 +800,6 @@ public Method[] getDeclaredMethods() throws SecurityException {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.DECLARED)} denies access to the declared
-	 *                constructors within this class
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -870,9 +829,6 @@ public Constructor[] getDeclaredConstructors() throws SecurityException {
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.DECLARED)} denies access to the declared field
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -908,9 +864,6 @@ public Field getDeclaredField(String name) throws NoSuchFieldException, Security
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.DECLARED)} denies access to the declared method
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
@@ -942,10 +895,6 @@ public Method getDeclaredMethod(String name, Class... parameterTypes) throws NoS
 	 *
 	 *                <ul>
 	 *
-	 *                <li>invocation of {@link SecurityManager#checkMemberAccess
-	 *                s.checkMemberAccess(this, Member.DECLARED)} denies access to the declared
-	 *                constructor
-	 *
 	 *                <li>the caller's class loader is not the same as or an ancestor of the class
 	 *                loader for the current class and invocation of
 	 *                {@link SecurityManager#checkPackageAccess s.checkPackageAccess()} denies access to
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/ExpressionAsStatement.java b/core/src/main/java/lucee/transformer/bytecode/statement/ExpressionAsStatement.java
index 84d28d185d..31ec560939 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/ExpressionAsStatement.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/ExpressionAsStatement.java
@@ -45,7 +45,7 @@ public ExpressionAsStatement(Expression expr) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/NativeSwitch.java b/core/src/main/java/lucee/transformer/bytecode/statement/NativeSwitch.java
index 40d9614352..0b0066ff51 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/NativeSwitch.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/NativeSwitch.java
@@ -138,7 +138,7 @@ public Case(int value, Statement body, Position startline, Position endline, boo
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.FlowControl#getBreakLabel()
+	 * @see lucee.transformer.bytecode.statement.FlowControl#getLabel()
 	 */
 	@Override
 	public Label getBreakLabel() {
@@ -147,7 +147,7 @@ public Label getBreakLabel() {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.FlowControl#getContinueLabel()
+	 * @see lucee.transformer.bytecode.statement.FlowControl#getLabel()
 	 */
 	@Override
 	public Label getContinueLabel() {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/PrintOut.java b/core/src/main/java/lucee/transformer/bytecode/statement/PrintOut.java
index fba6b7163f..0066510939 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/PrintOut.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/PrintOut.java
@@ -58,7 +58,7 @@ public PrintOut(Expression expr, Position start, Position end) {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.Statement#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.Statement#writeOut(BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/Switch.java b/core/src/main/java/lucee/transformer/bytecode/statement/Switch.java
index 2cd8a7f8e6..ae7f4de23a 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/Switch.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/Switch.java
@@ -131,7 +131,7 @@ public void _writeOut(BytecodeContext bc) throws TransformerException {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.FlowControl#getBreakLabel()
+	 * @see lucee.transformer.bytecode.statement.FlowControl#getLabel()
 	 */
 	@Override
 	public Label getBreakLabel() {
@@ -140,7 +140,7 @@ public Label getBreakLabel() {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.FlowControl#getContinueLabel()
+	 * @see lucee.transformer.bytecode.statement.FlowControl#getLabel()
 	 */
 	public Label getContinueLabel() {
 		return ns.getContinueLabel();
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/SystemOut.java b/core/src/main/java/lucee/transformer/bytecode/statement/SystemOut.java
index 2689035457..d275ec0c20 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/SystemOut.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/SystemOut.java
@@ -50,7 +50,7 @@ public SystemOut(Expression expr, Position start, Position end) {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/TryCatchFinally.java b/core/src/main/java/lucee/transformer/bytecode/statement/TryCatchFinally.java
index b8c705caab..65ee4a93df 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/TryCatchFinally.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/TryCatchFinally.java
@@ -123,7 +123,7 @@ public Catch(ExprString type, VariableRef name, Body body, Position line) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagBreak.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagBreak.java
index 55ff83f5b0..b4f942f70a 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagBreak.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagBreak.java
@@ -37,7 +37,7 @@ public TagBreak(Factory f, Position start, Position end) {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagInclude.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagInclude.java
index 7b47c7bb45..3b3997e1db 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagInclude.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagInclude.java
@@ -41,7 +41,7 @@ public TagInclude(Factory f, Position start, Position end) {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagJavaScript.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagJavaScript.java
index b8918e4253..4e837d1d2c 100644
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagJavaScript.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagJavaScript.java
@@ -31,7 +31,7 @@ public TagJavaScript(Factory f, Position start, Position end) {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagLoop.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagLoop.java
index 9b948a52f6..fc53054b34 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagLoop.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagLoop.java
@@ -152,7 +152,7 @@ public void setType(int type) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
@@ -840,7 +840,7 @@ private void writeOutTypeListArray(BytecodeContext bc, boolean isArray) throws T
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.FlowControl#getBreakLabel()
+	 * @see lucee.transformer.bytecode.statement.FlowControl#getLabel()
 	 */
 	@Override
 	public Label getBreakLabel() {
@@ -848,7 +848,7 @@ public Label getBreakLabel() {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.FlowControl#getContinueLabel()
+	 * @see lucee.transformer.bytecode.statement.FlowControl#getLabel()
 	 */
 	@Override
 	public Label getContinueLabel() {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagOutput.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagOutput.java
index 3bfd2ff96d..bdfdc2a260 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagOutput.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagOutput.java
@@ -56,7 +56,7 @@ public void setType(int type) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagReThrow.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagReThrow.java
index bfa7101ce8..70b77e3202 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagReThrow.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagReThrow.java
@@ -38,7 +38,7 @@ public TagReThrow(Factory f, Position start, Position end) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagRetry.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagRetry.java
index d01d73d6be..1e23799876 100644
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagRetry.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagRetry.java
@@ -35,7 +35,7 @@ public TagRetry(Factory f, Position start, Position end) {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagReturn.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagReturn.java
index dbbd3b3913..d66e34db25 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagReturn.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagReturn.java
@@ -35,7 +35,7 @@ public TagReturn(Factory f, Position start, Position end) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagScript.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagScript.java
index 40a3d04298..24f79f24a2 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagScript.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagScript.java
@@ -31,7 +31,7 @@ public TagScript(Factory f, Position start, Position end) {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagSilent.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagSilent.java
index 51071cc529..35f18510d6 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagSilent.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagSilent.java
@@ -51,7 +51,7 @@ public TagSilent(Factory f, Position start, Position end) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagSwitch.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagSwitch.java
index 181212ab05..b411480365 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagSwitch.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagSwitch.java
@@ -54,7 +54,7 @@ public TagSwitch(Factory f, Position start, Position end) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.tag.TagBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagWhile.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagWhile.java
index 57c6f11380..e7d47ff6c5 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagWhile.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagWhile.java
@@ -39,7 +39,7 @@ public TagWhile(Factory f, Position start, Position end) {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.statement.StatementBase#_writeOut(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void _writeOut(BytecodeContext bc) throws TransformerException {
@@ -52,7 +52,7 @@ public void _writeOut(BytecodeContext bc) throws TransformerException {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.FlowControl#getBreakLabel()
+	 * @see lucee.transformer.bytecode.statement.FlowControl#getLabel()
 	 */
 	@Override
 	public Label getBreakLabel() {
@@ -60,7 +60,7 @@ public Label getBreakLabel() {
 	}
 
 	/**
-	 * @see lucee.transformer.bytecode.statement.FlowControl#getContinueLabel()
+	 * @see lucee.transformer.bytecode.statement.FlowControl#getLabel()
 	 */
 	@Override
 	public Label getContinueLabel() {
diff --git a/core/src/main/java/lucee/transformer/bytecode/visitor/DoWhileVisitor.java b/core/src/main/java/lucee/transformer/bytecode/visitor/DoWhileVisitor.java
index f865dea468..0a78f0b616 100755
--- a/core/src/main/java/lucee/transformer/bytecode/visitor/DoWhileVisitor.java
+++ b/core/src/main/java/lucee/transformer/bytecode/visitor/DoWhileVisitor.java
@@ -67,7 +67,7 @@ public Label getContinueLabel() {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitContinue(BytecodeContext bc) {
@@ -76,7 +76,7 @@ public void visitContinue(BytecodeContext bc) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitBreak(BytecodeContext bc) {
diff --git a/core/src/main/java/lucee/transformer/bytecode/visitor/ForConditionIntVisitor.java b/core/src/main/java/lucee/transformer/bytecode/visitor/ForConditionIntVisitor.java
index 3c6c3949e7..111f655f67 100755
--- a/core/src/main/java/lucee/transformer/bytecode/visitor/ForConditionIntVisitor.java
+++ b/core/src/main/java/lucee/transformer/bytecode/visitor/ForConditionIntVisitor.java
@@ -94,7 +94,7 @@ public void visitEndAfterCondition(BytecodeContext bc) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitContinue(BytecodeContext bc) {
@@ -103,7 +103,7 @@ public void visitContinue(BytecodeContext bc) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitBreak(BytecodeContext bc) {
diff --git a/core/src/main/java/lucee/transformer/bytecode/visitor/ForDoubleVisitor.java b/core/src/main/java/lucee/transformer/bytecode/visitor/ForDoubleVisitor.java
index 40754566e1..c6ce30665c 100755
--- a/core/src/main/java/lucee/transformer/bytecode/visitor/ForDoubleVisitor.java
+++ b/core/src/main/java/lucee/transformer/bytecode/visitor/ForDoubleVisitor.java
@@ -79,7 +79,7 @@ public void forUpdate(GeneratorAdapter adapter, int step, boolean isLocal) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitContinue(BytecodeContext bc) {
@@ -88,7 +88,7 @@ public void visitContinue(BytecodeContext bc) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitBreak(BytecodeContext bc) {
diff --git a/core/src/main/java/lucee/transformer/bytecode/visitor/ForIntVisitor.java b/core/src/main/java/lucee/transformer/bytecode/visitor/ForIntVisitor.java
index 2b76d5f81e..0185b73a89 100755
--- a/core/src/main/java/lucee/transformer/bytecode/visitor/ForIntVisitor.java
+++ b/core/src/main/java/lucee/transformer/bytecode/visitor/ForIntVisitor.java
@@ -79,7 +79,7 @@ private void forUpdate(GeneratorAdapter adapter, int step, boolean isLocal) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitContinue(BytecodeContext bc) {
@@ -88,7 +88,7 @@ public void visitContinue(BytecodeContext bc) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitBreak(BytecodeContext bc) {
diff --git a/core/src/main/java/lucee/transformer/bytecode/visitor/ForVisitor.java b/core/src/main/java/lucee/transformer/bytecode/visitor/ForVisitor.java
index 37b9710ac5..44a607a9e9 100755
--- a/core/src/main/java/lucee/transformer/bytecode/visitor/ForVisitor.java
+++ b/core/src/main/java/lucee/transformer/bytecode/visitor/ForVisitor.java
@@ -81,7 +81,7 @@ private void forInit(GeneratorAdapter adapter, int start, boolean isLocal) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitContinue(BytecodeContext bc) {
@@ -90,7 +90,7 @@ public void visitContinue(BytecodeContext bc) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitBreak(BytecodeContext bc) {
diff --git a/core/src/main/java/lucee/transformer/bytecode/visitor/WhileVisitor.java b/core/src/main/java/lucee/transformer/bytecode/visitor/WhileVisitor.java
index 61cd6f9d94..39c83448c5 100755
--- a/core/src/main/java/lucee/transformer/bytecode/visitor/WhileVisitor.java
+++ b/core/src/main/java/lucee/transformer/bytecode/visitor/WhileVisitor.java
@@ -47,7 +47,7 @@ public void visitAfterBody(BytecodeContext bc, Position endline) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitContinue(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitContinue(BytecodeContext bc) {
@@ -56,7 +56,7 @@ public void visitContinue(BytecodeContext bc) {
 
 	/**
 	 *
-	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(org.objectweb.asm.commons.GeneratorAdapter)
+	 * @see lucee.transformer.bytecode.visitor.LoopVisitor#visitBreak(lucee.transformer.bytecode.BytecodeContext)
 	 */
 	@Override
 	public void visitBreak(BytecodeContext bc) {
diff --git a/core/src/main/java/lucee/transformer/cfml/ExprTransformer.java b/core/src/main/java/lucee/transformer/cfml/ExprTransformer.java
index cb18d591bf..815de5db9b 100755
--- a/core/src/main/java/lucee/transformer/cfml/ExprTransformer.java
+++ b/core/src/main/java/lucee/transformer/cfml/ExprTransformer.java
@@ -35,7 +35,7 @@ public interface ExprTransformer {
 	 * Wird aufgerufen um aus dem uebergebenen CFMLString einen Ausdruck auszulesen und diesen in ein
 	 * CFXD Element zu uebersetzten. <br>
 	 * Beispiel eines uebergebenen String:<br>
-	 * "session.firstName" oder "trim(left('test'&var1,3))"
+	 * "session.firstName" oder "trim(left('test'&amp;var1,3))"
 	 * 
 	 * @param data
 	 * @return Element CFXD Element
@@ -49,7 +49,7 @@ public interface ExprTransformer {
 	 * CFXD Element zu uebersetzten. Es wird aber davon ausgegangen das es sich um einen String handelt.
 	 * <br>
 	 * Beispiel eines uebergebenen String:<br>
-	 * "session.firstName" oder "trim(left('test'&var1,3))"
+	 * "session.firstName" oder "trim(left('test'&amp;var1,3))"
 	 * 
 	 * @param data
 	 * @return Element CFXD Element
diff --git a/core/src/main/java/lucee/transformer/cfml/evaluator/impl/TreeItem.java b/core/src/main/java/lucee/transformer/cfml/evaluator/impl/TreeItem.java
index b66129306f..a67864291c 100755
--- a/core/src/main/java/lucee/transformer/cfml/evaluator/impl/TreeItem.java
+++ b/core/src/main/java/lucee/transformer/cfml/evaluator/impl/TreeItem.java
@@ -31,8 +31,8 @@
 public final class TreeItem extends EvaluatorSupport {
 
 	/**
-	 * @see lucee.transformer.cfml.evaluator.EvaluatorSupport#evaluate(org.w3c.dom.Element,
-	 *      lucee.transformer.library.tag.TagLibTag)
+	 * @see lucee.transformer.cfml.evaluator.EvaluatorSupport#evaluate(Tag,TagLibTag)
+	 * 
 	 */
 	@Override
 	public void evaluate(Tag tag, TagLibTag libTag) throws EvaluatorException {
diff --git a/core/src/main/java/lucee/transformer/cfml/evaluator/impl/Try.java b/core/src/main/java/lucee/transformer/cfml/evaluator/impl/Try.java
index aa8daec670..e897fa6bbd 100755
--- a/core/src/main/java/lucee/transformer/cfml/evaluator/impl/Try.java
+++ b/core/src/main/java/lucee/transformer/cfml/evaluator/impl/Try.java
@@ -37,7 +37,7 @@
 public final class Try extends EvaluatorSupport {
 
 	/**
-	 * @see lucee.transformer.cfml.evaluator.EvaluatorSupport#evaluate(Element)
+	 * @see lucee.transformer.cfml.evaluator.EvaluatorSupport#evaluate(lucee.transformer.bytecode.statement.tag.Tag)
 	 */
 	@Override
 	public void evaluate(Tag tag) throws EvaluatorException {
diff --git a/core/src/main/java/lucee/transformer/cfml/expression/AbstrCFMLExprTransformer.java b/core/src/main/java/lucee/transformer/cfml/expression/AbstrCFMLExprTransformer.java
index dc2a5d16ff..e8f98d5e2f 100755
--- a/core/src/main/java/lucee/transformer/cfml/expression/AbstrCFMLExprTransformer.java
+++ b/core/src/main/java/lucee/transformer/cfml/expression/AbstrCFMLExprTransformer.java
@@ -98,14 +98,14 @@
 	xorOp          = orOp {"xor" spaces  orOp};
 	orOp           = andOp {("or" | "||") spaces andOp}; 
 			(* "||" Existiert in CFMX nicht *)
-	andOp          = notOp {("and" | "&&") spaces notOp}; 
-			(* "&&" Existiert in CFMX nicht *) 
+	andOp          = notOp {("and" | "&amp;&amp;") spaces notOp}; 
+			(* "&amp;&amp;" Existiert in CFMX nicht *) 
 	notOp          = [("not"|"!") spaces] decsionOp; 
 			(* "!" Existiert in CFMX nicht *)
 	decsionOp      = concatOp {("neq"|"eq"|"gte"|"gt"|"lte"|"lt"|"ct"|
 	                 "contains"|"nct"|"does not contain") spaces concatOp}; 
 			(* "ct"=conatains und "nct"=does not contain; Existiert in CFMX nicht *)
-	concatOp       = plusMinusOp {"&" spaces plusMinusOp};
+	concatOp       = plusMinusOp {"&amp;" spaces plusMinusOp};
 	plusMinusOp    = modOp {("-"|"+") spaces modOp};
 	modOp          = divMultiOp {("mod" | "%") spaces divMultiOp}; 
 	                (* modulus operator , "%" Existiert in CFMX nicht *)
diff --git a/core/src/main/java/lucee/transformer/cfml/tag/CFMLTransformer.java b/core/src/main/java/lucee/transformer/cfml/tag/CFMLTransformer.java
index 91ea58e084..2c21052804 100755
--- a/core/src/main/java/lucee/transformer/cfml/tag/CFMLTransformer.java
+++ b/core/src/main/java/lucee/transformer/cfml/tag/CFMLTransformer.java
@@ -81,14 +81,14 @@
 		EBNF (Extended Backus-Naur Form) 
 		
 		transform	= {body}
-		body		= [comment] ("</" | "<" tag body | literal body);
+		body		= [comment] ("&lt;/" | "&lt;" tag body | literal body);
 		comment		= "<!---" {?-"--->"} "--->";
-		literal		= ("<" | {?-"#"-"<"} "<" | {"#" expression "#"} "<" ) | ({?-"<"} "<")
+		literal		= ("&lt;" | {?-"#"-"&lt;"} "&lt;" | {"#" expression "#"} "&lt;" ) | ({?-"&lt;"} "&lt;")
 				  (* Welcher Teil der "oder" Bedingung ausgefuehrt wird, ist abhaengig was die Tag-Lib vorgibt, 
 				     dass Expression geparst werden sollen oder nicht. *)
-		tag		= name-space identifier spaces attributes ("/>" | ">" [body "</" identifier spaces ">"]);
+		tag		= name-space identifier spaces attributes ("/&gt;" | "&gt;" [body "&lt;/" identifier spaces "&gt;"]);
 				  (* Ob dem Tag ein Body und ein End-Tag folgt ist abhaengig von Definition des body-content in Tag-Lib, gleices gilt fuer appendix *)
-		name-space	= < tagLib[].getNameSpaceAndSeperator() >;
+		name-space	= &lt; tagLib[].getNameSpaceAndSeperator() &gt;;
 			          (* Vergleicht Zeichen mit den Namespacedefinitionen der Tag Libraries. *)
 		attributes	= ({spaces attribute} "/>" | {spaces attribute} ">") | attribute-value;
 				  (* Welcher Teil der "oder" Bedingung ausgefuehrt wird, ist abhaengig von der Tag Attribute Definition in der Tag Lib. *)
@@ -99,7 +99,7 @@
 		identifier     	= (letter | "_") {letter | "_"|digit};
 		letter			= "a".."z"|"A".."Z";
 		digit			= "0".."9";
-		expression      = <ExprTransfomer.expression()>; (* Ruft den Expression Transformer auf. *)
+		expression      = &lt;ExprTransfomer.expression()&gt;; (* Ruft den Expression Transformer auf. *)
 		spaces         = {space};
 		space          = "\s"|"\t"|"\f"|"\t"|"\n";
 		
@@ -334,7 +334,7 @@ public void transform(Data data, Body parent) throws TemplateException {
 	/**
 	 * Liest den Body eines Tag ein. Kommentare, Tags und Literale inkl. Expressions. <br />
 	 * EBNF:<br />
-	 * <code>[comment] ("</" | "<" tag body | literal body);</code>
+	 * <code>[comment] ("&lt;/" | "&lt;" tag body | literal body);</code>
 	 * 
 	 * @param data
 	 * @param body
@@ -861,7 +861,7 @@ else if (newIsCustom) {
 	 * Vergleicht folgende Zeichen mit den Namespacedefinitionen der Tag Libraries, gibt eine Tag-Lib
 	 * zurueck falls eine passt, ansonsten null. <br />
 	 * EBNF:<br />
-	 * <code>< tagLib[].getNameSpaceAndSeperator() >(* Vergleicht Zeichen mit den Namespacedefinitionen der Tag Libraries. *) </code>
+	 * <code>&lt; tagLib[].getNameSpaceAndSeperator() &gt;(* Vergleicht Zeichen mit den Namespacedefinitionen der Tag Libraries. *) </code>
 	 * 
 	 * @return TagLib Passende Tag Lirary oder null.
 	 */
diff --git a/core/src/main/java/lucee/transformer/library/tag/ImportTagLib.java b/core/src/main/java/lucee/transformer/library/tag/ImportTagLib.java
index 1722397ca1..724bf6ea95 100755
--- a/core/src/main/java/lucee/transformer/library/tag/ImportTagLib.java
+++ b/core/src/main/java/lucee/transformer/library/tag/ImportTagLib.java
@@ -45,7 +45,7 @@ public TagLibTag getAppendixTag(String name) {
 	}
 
 	/**
-	 * @see lucee.transformer.library.tag.TagLib#getELClass()
+	 * @see lucee.transformer.library.tag.TagLib#getELClassDefinition()
 	 */
 	@Override
 	public ClassDefinition<? extends ExprTransformer> getELClassDefinition() {