diff --git a/src/com/plantuml/api/cheerpj/JsonResult.java b/src/com/plantuml/api/cheerpj/JsonResult.java
index 8153f294c..c76fe641f 100644
--- a/src/com/plantuml/api/cheerpj/JsonResult.java
+++ b/src/com/plantuml/api/cheerpj/JsonResult.java
@@ -40,7 +40,7 @@ import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.core.ImageData;
 import net.sourceforge.plantuml.error.PSystemError;
 
-//::uncomment when __CORE__
+//::revert when __CORE__
 //import com.leaningtech.client.Global;
 //::done
 
@@ -55,10 +55,8 @@ public class JsonResult {
 
 	private Object done() {
 		sb.append("}");
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		return sb.toString();
-		// ::done
-		// ::uncomment when __CORE__
 		// return Global.JSString(sb.toString());
 		// ::done
 	}
diff --git a/src/com/plantuml/api/cheerpj/WasmLog.java b/src/com/plantuml/api/cheerpj/WasmLog.java
index 7cc650a48..3c08cbe36 100644
--- a/src/com/plantuml/api/cheerpj/WasmLog.java
+++ b/src/com/plantuml/api/cheerpj/WasmLog.java
@@ -37,7 +37,7 @@ package com.plantuml.api.cheerpj;
 
 import net.sourceforge.plantuml.utils.Log;
 
-//::uncomment when __CORE__
+//::revert when __CORE__
 //import com.leaningtech.client.Document;
 //import com.leaningtech.client.Element;
 //import com.leaningtech.client.Global;
@@ -48,10 +48,8 @@ public class WasmLog {
 	public static long start;
 
 	public static void log(String message) {
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		Log.info(message);
-		// ::done
-		// ::uncomment when __CORE__
 //		try {
 //			if (start > 0) {
 //				final long duration = System.currentTimeMillis() - start;
diff --git a/src/com/plantuml/api/cheerpj/v1/Info.java b/src/com/plantuml/api/cheerpj/v1/Info.java
index e15a5d0c5..e69d51853 100644
--- a/src/com/plantuml/api/cheerpj/v1/Info.java
+++ b/src/com/plantuml/api/cheerpj/v1/Info.java
@@ -55,7 +55,7 @@ import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.preproc.Defines;
 
-//::uncomment when __CORE__
+//::revert when __CORE__
 //import com.leaningtech.client.Global;
 //::done
 
@@ -69,10 +69,8 @@ public class Info {
 			e.printStackTrace();
 			result = "";
 		}
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		return result;
-		// ::done
-		// ::uncomment when __CORE__
 		// return Global.JSString(result);
 		// ::done
 	}
@@ -85,10 +83,8 @@ public class Info {
 			e.printStackTrace();
 			result = "";
 		}
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		return result;
-		// ::done
-		// ::uncomment when __CORE__
 		// return Global.JSString(result);
 		// ::done
 	}
diff --git a/src/com/plantuml/api/cheerpj/v1/Png.java b/src/com/plantuml/api/cheerpj/v1/Png.java
index f266d82e0..070377eba 100644
--- a/src/com/plantuml/api/cheerpj/v1/Png.java
+++ b/src/com/plantuml/api/cheerpj/v1/Png.java
@@ -59,7 +59,7 @@ import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.klimt.color.ColorMapper;
 import net.sourceforge.plantuml.preproc.Defines;
 
-//::uncomment when __CORE__
+//::revert when __CORE__
 //import com.leaningtech.client.Global;
 //::done
 
@@ -142,10 +142,8 @@ public class Png {
 			os64.close();
 
 			final String base64 = os64.toString();
-			// ::comment when __CORE__
+			// ::revert when __CORE__
 			return base64;
-			// ::done
-			// ::uncomment when __CORE__
 			// return Global.JSString(base64);
 			// ::done
 
diff --git a/src/com/plantuml/api/cheerpj/v1/Svg.java b/src/com/plantuml/api/cheerpj/v1/Svg.java
index 5676ec513..9a654a443 100644
--- a/src/com/plantuml/api/cheerpj/v1/Svg.java
+++ b/src/com/plantuml/api/cheerpj/v1/Svg.java
@@ -57,7 +57,7 @@ import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.klimt.color.ColorMapper;
 import net.sourceforge.plantuml.preproc.Defines;
 
-//::uncomment when __CORE__
+//::revert when __CORE__
 //import com.leaningtech.client.Global;
 //::done
 
@@ -98,10 +98,8 @@ public class Svg {
 			WasmLog.log("Done!");
 			svgos.close();
 			final String svg = svgos.toString();
-			// ::comment when __CORE__
+			// ::revert when __CORE__
 			return svg;
-			// ::done
-			// ::uncomment when __CORE__
 			// return Global.JSString(svg);
 			// ::done
 
diff --git a/src/gen/lib/dotgen/position__c.java b/src/gen/lib/dotgen/position__c.java
index 576d4df34..5d93a2954 100644
--- a/src/gen/lib/dotgen/position__c.java
+++ b/src/gen/lib/dotgen/position__c.java
@@ -659,7 +659,7 @@ try {
     margin = late_int (g, zz.G_margin, 8, 0);
     make_lrvn(g);
     for (c = 1; c <= GD_n_cluster(g); c++) {
-	subg = (ST_Agraph_s) GD_clust(g).get_(c);
+	subg = GD_clust(g).get_(c);
 	make_lrvn(subg);
 	make_aux_edge(GD_ln(g), GD_ln(subg),
 		      margin + GD_border(g)[3].x, 0);
@@ -687,11 +687,11 @@ try {
     ST_Agraph_s left, right;
     margin = late_int (g, zz.G_margin, 8, 0);
     for (i = 1; i <= GD_n_cluster(g); i++)
-	make_lrvn((ST_Agraph_s) GD_clust(g).get_(i));
+	make_lrvn(GD_clust(g).get_(i));
     for (i = 1; i <= GD_n_cluster(g); i++) {
 	for (j = i + 1; j <= GD_n_cluster(g); j++) {
-	    low = (ST_Agraph_s) GD_clust(g).get_(i);
-	    high = (ST_Agraph_s) GD_clust(g).get_(j);
+	    low = GD_clust(g).get_(i);
+	    high = GD_clust(g).get_(j);
 	    if (GD_minrank(low) > GD_minrank(high)) {
 		ST_Agraph_s temp = low;
 		low = high;
@@ -709,7 +709,7 @@ try {
 	    }
 	    make_aux_edge(GD_rn(left), GD_ln(right), margin, 0);
 	}
-	separate_subclust(zz, (ST_Agraph_s) GD_clust(g).get_(i));
+	separate_subclust(zz, GD_clust(g).get_(i));
     }
 } finally {
 LEAVING("6oruu1p1b7kxr5moh3kmcmvr3","separate_subclust");
diff --git a/src/net/atmp/ImageBuilder.java b/src/net/atmp/ImageBuilder.java
index 5d720112f..8447ec40a 100644
--- a/src/net/atmp/ImageBuilder.java
+++ b/src/net/atmp/ImageBuilder.java
@@ -270,10 +270,8 @@ public class ImageBuilder {
 		}
 	}
 
-	// ::comment when __CORE__
+	// ::revert when __CORE__
 	private ImageData writeImageInternal(OutputStream os, Animation animationArg) throws IOException {
-		// ::done
-		// ::uncomment when __CORE__
 		// private ImageData writeImageInternal(OutputStream os) throws IOException {
 		// ::done
 		XDimension2D dim = getFinalDimension();
@@ -294,11 +292,9 @@ public class ImageBuilder {
 		if (scaleFactor <= 0)
 			throw new IllegalStateException("Bad scaleFactor");
 		WasmLog.log("...image drawing...");
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		UGraphic ug = createUGraphic(dim, animationArg, dx, dy, scaleFactor,
 				titledDiagram == null ? new Pragma() : titledDiagram.getPragma());
-		// ::done
-		// ::uncomment when __CORE__
 		// UGraphic ug = createUGraphic(dim, dx, dy, scaleFactor,
 		// titledDiagram == null ? new Pragma() : titledDiagram.getPragma());
 		// ::done
@@ -427,11 +423,9 @@ public class ImageBuilder {
 	}
 	// ::done
 
-	// ::comment when __CORE__
+	// ::revert when __CORE__
 	private UGraphic createUGraphic(final XDimension2D dim, Animation animationArg, double dx, double dy,
 			double scaleFactor, Pragma pragma) {
-		// ::done
-		// ::uncomment when __CORE__
 		// private UGraphic createUGraphic(final XDimension2D dim, double dx, double dy,
 		// double scaleFactor, Pragma pragma) {
 		// ::done
diff --git a/src/net/sourceforge/plantuml/StringUtils.java b/src/net/sourceforge/plantuml/StringUtils.java
index 29ae48740..eb084e10c 100644
--- a/src/net/sourceforge/plantuml/StringUtils.java
+++ b/src/net/sourceforge/plantuml/StringUtils.java
@@ -54,19 +54,15 @@ import net.sourceforge.plantuml.utils.Log;
 public class StringUtils {
 
 	public static String goUpperCase(String s) {
-		// ::comment when __HAXE__
+		// ::revert when __HAXE__
 		return s.toUpperCase(Locale.ENGLISH);
-		// ::done
-		// ::uncomment when __HAXE__
 		// return s.toUpperCase();
 		// ::done
 	}
 
 	public static String goLowerCase(String s) {
-		// ::comment when __HAXE__
+		// ::revert when __HAXE__
 		return s.toLowerCase(Locale.ENGLISH);
-		// ::done
-		// ::uncomment when __HAXE__
 		// return s.toLowerCase();
 		// ::done
 	}
diff --git a/src/net/sourceforge/plantuml/klimt/color/NoSuchColorException.java b/src/net/sourceforge/plantuml/klimt/color/NoSuchColorException.java
index 49daa29b8..b98854106 100644
--- a/src/net/sourceforge/plantuml/klimt/color/NoSuchColorException.java
+++ b/src/net/sourceforge/plantuml/klimt/color/NoSuchColorException.java
@@ -37,4 +37,8 @@ package net.sourceforge.plantuml.klimt.color;
 
 public class NoSuchColorException extends Exception {
 
+	public NoSuchColorException() {
+		super("NoSuchColorException");
+	}
+
 }
diff --git a/src/net/sourceforge/plantuml/klimt/font/UFont.java b/src/net/sourceforge/plantuml/klimt/font/UFont.java
index 9cb12d178..32bbdc0f7 100644
--- a/src/net/sourceforge/plantuml/klimt/font/UFont.java
+++ b/src/net/sourceforge/plantuml/klimt/font/UFont.java
@@ -91,10 +91,8 @@ public class UFont {
 	}
 
 	private static boolean doesFamilyExists(String name) {
-		// ::comment when __HAXE__
+		// ::revert when __HAXE__
 		return names.contains(name.toLowerCase());
-		// ::done
-		// ::uncomment when __HAXE__
 		// return true;
 		// ::done
 	}
diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java
index 4024ec678..974da81a3 100644
--- a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java
+++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java
@@ -287,10 +287,8 @@ public class DrawableSet {
 
 	private void drawLineU22(UGraphic ug, boolean showTail, Page page) {
 		// http://plantuml.sourceforge.net/qa/?qa=4826/lifelines-broken-for-txt-seq-diagrams-when-create-is-used
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		final boolean isTxt = ug instanceof UGraphicTxt;
-		// ::done
-		// ::uncomment when __CORE__
 		// final boolean isTxt = false;
 		// ::done
 		for (LivingParticipantBox box : getAllLivingParticipantBox()) {
diff --git a/src/net/sourceforge/plantuml/url/Url.java b/src/net/sourceforge/plantuml/url/Url.java
index bf3f2c00e..e660af652 100644
--- a/src/net/sourceforge/plantuml/url/Url.java
+++ b/src/net/sourceforge/plantuml/url/Url.java
@@ -51,13 +51,11 @@ public class Url implements EnsureVisible {
 	public Url(String url, String tooltip, String label) {
 		url = StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(url, "\"");
 		this.url = url;
-		// ::comment when __HAXE__
+		// ::revert when __HAXE__
 		if (tooltip == null)
 			this.tooltip = url;
 		else
 			this.tooltip = BackSlash.manageNewLine(tooltip);
-		// ::done
-		// ::uncomment when __HAXE__
 		// this.tooltip = url;
 		// ::done
 
diff --git a/src/net/sourceforge/plantuml/version/LicenseInfo.java b/src/net/sourceforge/plantuml/version/LicenseInfo.java
index 1d74ac271..a942f267a 100644
--- a/src/net/sourceforge/plantuml/version/LicenseInfo.java
+++ b/src/net/sourceforge/plantuml/version/LicenseInfo.java
@@ -56,24 +56,20 @@ import net.sourceforge.plantuml.utils.SignatureUtils;
 public class LicenseInfo {
 
 	public static synchronized LicenseInfo retrieveQuick() {
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		if (cache == null)
 			cache = retrieveDistributor();
 
 		if (cache == null)
 			cache = retrieveNamedSlow();
 		return cache;
-		// ::done
-		// ::uncomment when __CORE__
 		// return new LicenseInfo();
 		// ::done
 	}
 
 	public boolean isValid() {
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		return owner != null && System.currentTimeMillis() <= this.expirationDate;
-		// ::done
-		// ::uncomment when __CORE__
 		// return false;
 		// ::done
 	}
diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java
index e4f311ae4..470ff8483 100644
--- a/src/net/sourceforge/plantuml/version/Version.java
+++ b/src/net/sourceforge/plantuml/version/Version.java
@@ -46,7 +46,7 @@ public class Version {
 	private static final int MAJOR_SEPARATOR = 1000000;
 
 	public static int version() {
-		return 1202302;
+		return 1202303;
 	}
 
 	public static int versionPatched() {
@@ -82,7 +82,7 @@ public class Version {
 	}
 
 	public static int beta() {
-		final int beta = 7;
+		final int beta = 0;
 		return beta;
 	}
 
@@ -95,7 +95,7 @@ public class Version {
 	}
 
 	public static long compileTime() {
-		return 1677403547300L;
+		return 1678383018950L;
 	}
 
 	public static String compileTimeString() {
diff --git a/src/smetana/core/Macro.java b/src/smetana/core/Macro.java
index bc70ec8bb..e679d6694 100644
--- a/src/smetana/core/Macro.java
+++ b/src/smetana/core/Macro.java
@@ -83,6 +83,7 @@ final public class Macro {
 	}
 
 	public static __ptr__ UNSUPPORTED(String comment) {
+		SmetanaDebug.LIST_METHODS();
 		throw new UnsupportedOperationException(comment);
 	}
 
diff --git a/src/smetana/core/UnsupportedStarStruct.java b/src/smetana/core/UnsupportedStarStruct.java
index db055731f..0c6ac4a5b 100644
--- a/src/smetana/core/UnsupportedStarStruct.java
+++ b/src/smetana/core/UnsupportedStarStruct.java
@@ -40,10 +40,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class UnsupportedStarStruct implements __struct__, __ptr__ {
 
-	// ::comment when __CORE__
+	// ::revert when __CORE__
 	public final static AtomicInteger CPT = new AtomicInteger();
-	// ::done
-	// ::uncomment when __CORE__
 	// public static int CPT;
 	// ::done
 	public final int UID;
@@ -51,10 +49,8 @@ public class UnsupportedStarStruct implements __struct__, __ptr__ {
 	public static UnsupportedStarStruct SPY_ME;
 
 	public UnsupportedStarStruct() {
-		// ::comment when __CORE__
+		// ::revert when __CORE__
 		this.UID = CPT.incrementAndGet();
-		// ::done
-		// ::uncomment when __CORE__
 		// this.UID = CPT++;
 		// ::done
 	}