diff --git a/build.properties b/build.properties
index 2d38b9f13c7e911590a334e2f995526a70a5c100..9758be32e7c04e4d2adb7d4bcb96f8dfd4528517 100644
--- a/build.properties
+++ b/build.properties
@@ -17,15 +17,15 @@ common.run.args=-Xmx256m \
 
 win.run.args=${common.run.args}
 
-run.arg1=-Dawt.useSystemAAFontSettings=gasp
-unix.run.args=${common.run.args} ${run.arg1}
+unix.run.args=${common.run.args} \
+    -Dawt.useSystemAAFontSettings=gasp
 
-run.arg2=-Dapple.awt.graphics.UseQuartz=true \
+mac.run.args=${common.run.args} \
+    -Dapple.awt.graphics.UseQuartz=true \
     -Dapple.laf.useScreenMenuBar=true \
     -Dapple.awt.brushMetalLook=true \
     -Xdock:name=${product.shortname} \
     --add-exports java.desktop/com.apple.eawt=ALL-UNNAMED
-mac.run.args=${common.run.args} ${run.arg2}
 
 # property used to identify Viskit config files
 dot.viskit.dir=${user.home}/.${product.shortname}
diff --git a/build.xml b/build.xml
index 3e8559d124c43ae4053da712ce3882372836c8bd..6223df117e8f940eb31b536f90dfa0daab754ec1 100644
--- a/build.xml
+++ b/build.xml
@@ -319,7 +319,7 @@ POSSIBILITY OF SUCH DAMAGE.
         <copy                todir ="${dot.viskit.dir}"           file="${c_gui.xml}"/>
     </target>
 
-    <target name="reset.viskit" description="clear an out of synch configuration and metadata directory - only when necessary">
+    <target name="reset.viskit" description="Replace an out-of-synch configuration with known good defaults - only when necessary">
         <echo message="Reset user's Viskit configuration files in ${dot.viskit.dir}"/>
         <delete includeemptydirs="yes" dir="${dot.viskit.dir}"/>
         <mkdir dir="${dot.viskit.dir}"/>
diff --git a/examples/nbproject/project.properties b/examples/nbproject/project.properties
index a659c6016220db9cc02cbfe18f4b1c0ce29a9244..bb12d3f683a507710517c28cff44c8c0ff5a9892 100644
--- a/examples/nbproject/project.properties
+++ b/examples/nbproject/project.properties
@@ -1,121 +1,121 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.desc=Example programs provided as part of NPS course Networked Graphics MV3500. This course is an introduction to network communications in simulation applications. Topics include an introduction to the TCP/IP protocol stack; TCP/IP socket communications, including TCP, UDP, and multicast; and protocol design issues, with emphasis on Distributed Interactive Simulation (DIS) Protocol and High Level Architecture (HLA). Course emphasis is on creation and testing of network programming network code and web-browser applications.
-application.homepage=https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples
-application.splash=..\\..\\NetworkedGraphicsMV3500\\documentation\\images\\OpenDisSurferDude.png
-application.title=NPS Networked Graphics MV3500 examples
-application.vendor=Don Brutzman
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.modulepath=\
-    ${run.modulepath}
-debug.test.classpath=\
-    ${run.test.classpath}
-debug.test.modulepath=\
-    ${run.test.modulepath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.name=Networked_Graphics_MV3500_examples
-dist.jar=${dist.dir}/${dist.name}.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-project.licensePath=../license.txt
-viskit.proj.dir=ViskitOpenDis7Examples
-viskit.proj.lib.dir=src/${viskit.proj.dir}/lib
-opendis.helper=SimkitOpenDis7Examples.run.OpenDisHelper
-excludes=ViskitOpenDis7Examples/
-file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
-file.reference.opendis7-full.jar=../lib/opendis7-full.jar
-file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
-file.reference.simkit-doc.zip=../lib/simkit-doc.zip
-file.reference.simkit-src.zip=../lib/simkit-src.zip
-file.reference.simkit.jar=../lib/simkit.jar
-#file.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-classes.jar
-#file.reference.opendis7-pdus-classes.jar=../lib/opendis7-pdus-classes.jar
-includes=**/*.java
-jar.compress=false
-javac.classpath=\
-    ${file.reference.opendis7-full.jar}:\
-    ${file.reference.open-dis_4.16.jar}:\
-    ${file.reference.dis-enums-1.3.jar}:\
-    ${file.reference.simkit.jar}:\
-    ${file.reference.simkit-doc.zip}:\
-    ${file.reference.simkit-src.zip}
-#   ${file.reference.opendis7-enumerations-classes.jar}:\
-#   ${file.reference.opendis7-pdus-classes.jar}:\
-
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
-javac.deprecation=false
-javac.external.vm=true
-javac.modulepath=
-javac.processormodulepath=
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=21
-javac.target=21
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.modulepath=\
-    ${javac.modulepath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=-header "NPS Networked Graphics MV3500 Examples"
-javadoc.author=true
-javadoc.encoding=${source.encoding}
-javadoc.html5=false
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-#javadoc.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-javadoc.jar
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=MV3500 Examples
-jlink.launcher=false
-jlink.launcher.name=Networked_Graphics_MV3500_examples
-main.class=TcpExamples.TcpExample1Telnet
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=JDK_22
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.modulepath=\
-    ${javac.modulepath}
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-run.test.modulepath=\
-    ${javac.test.modulepath}
-source.encoding=UTF-8
-#source.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-source.jar
-src.dir=src
-src.src.dir=otherProjects\\DisDemo\\src
-src.src2.dir=otherProjects\\DisShooting\\src
-src.src3.dir=otherProjects\\WebSocketGateway\\src
-#src.src4.dir=otherProjects\\BasicServletDemo\\src
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.desc=Example programs provided as part of NPS course Networked Graphics MV3500. This course is an introduction to network communications in simulation applications. Topics include an introduction to the TCP/IP protocol stack; TCP/IP socket communications, including TCP, UDP, and multicast; and protocol design issues, with emphasis on Distributed Interactive Simulation (DIS) Protocol and High Level Architecture (HLA). Course emphasis is on creation and testing of network programming network code and web-browser applications.
+application.homepage=https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples
+application.splash=..\\..\\NetworkedGraphicsMV3500\\documentation\\images\\OpenDisSurferDude.png
+application.title=NPS Networked Graphics MV3500 examples
+application.vendor=Don Brutzman
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.name=Networked_Graphics_MV3500_examples
+dist.jar=${dist.dir}/${dist.name}.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+project.licensePath=../license.txt
+viskit.proj.dir=ViskitOpenDis7Examples
+viskit.proj.lib.dir=src/${viskit.proj.dir}/lib
+opendis.helper=SimkitOpenDis7Examples.run.OpenDisHelper
+excludes=ViskitOpenDis7Examples/
+file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
+file.reference.opendis7-full.jar=../lib/opendis7-full.jar
+file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
+file.reference.simkit-doc.zip=../lib/simkit-doc.zip
+file.reference.simkit-src.zip=../lib/simkit-src.zip
+file.reference.simkit.jar=../lib/simkit.jar
+#file.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-classes.jar
+#file.reference.opendis7-pdus-classes.jar=../lib/opendis7-pdus-classes.jar
+includes=**/*.java
+jar.compress=false
+javac.classpath=\
+    ${file.reference.opendis7-full.jar}:\
+    ${file.reference.open-dis_4.16.jar}:\
+    ${file.reference.dis-enums-1.3.jar}:\
+    ${file.reference.simkit.jar}:\
+    ${file.reference.simkit-doc.zip}:\
+    ${file.reference.simkit-src.zip}
+#   ${file.reference.opendis7-enumerations-classes.jar}:\
+#   ${file.reference.opendis7-pdus-classes.jar}:\
+
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=21
+javac.target=21
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=-header "NPS Networked Graphics MV3500 Examples"
+javadoc.author=true
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+#javadoc.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-javadoc.jar
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=MV3500 Examples
+jlink.launcher=false
+jlink.launcher.name=Networked_Graphics_MV3500_examples
+main.class=TcpExamples.TcpExample1Telnet
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+#source.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-source.jar
+src.dir=src
+src.src.dir=otherProjects\\DisDemo\\src
+src.src2.dir=otherProjects\\DisShooting\\src
+src.src3.dir=otherProjects\\WebSocketGateway\\src
+#src.src4.dir=otherProjects\\BasicServletDemo\\src
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
index 87787fc2afa70f4122f89029fae5350ab3793b37..597e3466d1cbf16277106c2a88056fdaf381ce4b 100644
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
+++ b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
@@ -24,5 +24,6 @@
     <PropertyChangeListenerConnection property="N" listener="numArrivalsStat" source="aPOpenDis7" description=""/>
     <PropertyChangeListenerConnection property="C" listener="numEntityCreationsStat" source="aPOpenDis7" description=""/>
     <PropertyChangeListenerConnection property="R" listener="numEntityRemovalsStat" source="aPOpenDis7" description=""/>
+    <Output entity="aPOpenDis7"/>
     <Schedule stopTime="100.0" verbose="false" saveReplicationData="false"/>
 </SimkitAssembly>
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
old mode 100755
new mode 100644
index 11d6ab585dab9323bd35b9aad841dd336e49d286..5aac321ee51ee75c2eb1c78ec7618b2f475737d6
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
+++ b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
@@ -36,5 +36,7 @@
     <PropertyChangeListenerConnection property="numberAvailableServers" listener="numAvailServersStat" source="simpleServer" description=""/>
     <PropertyChangeListenerConnection property="numberArrivals" listener="numArrivalsStat" source="arrivalProcessOpenDis7" description=""/>
     <PropertyChangeListenerConnection property="numberServed" listener="numServedStat" source="simpleServer" description=""/>
+    <Output entity="arrivalProcessOpenDis7"/>
+    <Output entity="simpleServer"/>
     <Schedule stopTime="100000.0" verbose="false" saveReplicationData="false"/>
 </SimkitAssembly>
diff --git a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml
index ad872c9652eb9cd6581ba5a65b3d4d4db021ad2b..ab5bd43c6ad40ce491eb30c65e13c8af836d4316 100644
--- a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml
+++ b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimEntity name="SimpleMachineFailure" version="0.1" package="examples" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<SimEntity name="SimpleMachineFailure" version="0.1" package="examples" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <Parameter type="int" name="totalNumberMachines"/>
     <Parameter type="int" name="totalNumberRepairPeople"/>
     <Parameter type="simkit.random.RandomVariate" name="timeToFailure"/>
diff --git a/viskit/lib/viskit.jar b/viskit/lib/viskit.jar
index 9a7c4a7574779f8e7e76765f7ace939dab637828..fa2bd59262e5771603440b823ff8f2d664e1c123 100644
Binary files a/viskit/lib/viskit.jar and b/viskit/lib/viskit.jar differ