diff --git a/build.xml b/build.xml
index d8d9836c7a97de94d86289b147efe281a860472f..049afd2b651c17eab8bc406e657cb0f9a0632313 100644
--- a/build.xml
+++ b/build.xml
@@ -20,15 +20,18 @@
 
 	<target name="jar" depends="compile">
 		<mkdir dir="${jar.dir}"/>
+		<copy todir="${build.dir}/META-INF">
+		  <fileset dir="config" />
+		</copy>
 		<jar destfile="${jar.dir}/light-RPC-application.jar">
 			<manifest>
 				<attribute name="Main-Class" value="lightrpc.LightRPCMainStarter"/>
 				<attribute name="Class-Path" value="."/>
 			</manifest>
-			<fileset dir="${build.dir}"/>
-			<fileset dir="." includes="*LICENSE*" />
+			<fileset dir="${build.dir}" />
 			<zipfileset excludes="META-INF/*" src="lib/explorviz-monitoring.jar"/>
 		</jar>
+		<copy file="${jar.dir}/light-RPC-application.jar" tofile="release/light-RPC-application.jar"/>		
 	</target>
 	
 	<target name="compile">
diff --git a/config/aop.xml b/config/aop.xml
index 348369efca76ea9b30ece7a9867a58891b72d0d8..57f0658be8cbb6a9ec2ad3ffda3c5e78397a39fc 100644
--- a/config/aop.xml
+++ b/config/aop.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.aspectj.org/dtd/aspectj_1_5_0.dtd">
 
 <aspectj>
-	<weaver options="-Xset:weaveJavaPackages=true,weaveJavaxPackages=true -verbose -showWeaveInfo"> <!-- options="-verbose -showWeaveInfo -Xjoinpoints:synchronization" -->
+	<weaver options="-Xset:weaveJavaPackages=true,weaveJavaxPackages=true"> <!-- options="-verbose -showWeaveInfo -Xjoinpoints:synchronization" -->
 		<include within="*"/>
 	</weaver>
 
@@ -13,7 +13,7 @@
 			<pointcut name="monitoredConstructor" expression="execution(*..*.new(..))" />
 		</concrete-aspect>
 		<!-- Aspects for monitoring send and receive methods -->
-		<aspect name="explorviz.live_trace_processing.probe.distributed.concrete.ActiveMQProbe"/>
+		<!-- <aspect name="explorviz.live_trace_processing.probe.distributed.concrete.ActiveMQProbe"/> -->
 		<!-- <aspect name="explorviz.live_trace_processing.probe.distributed.concrete.HSQLDBProbe"/> -->
 		<aspect name="explorviz.live_trace_processing.probe.distributed.concrete.JAXWSProbeAdder"/>
 		<!-- <aspect name="explorviz.live_trace_processing.probe.distributed.concrete.ServletProbe"/> -->
diff --git a/lib/explorviz-monitoring.jar b/lib/explorviz-monitoring.jar
index 04ad3d55583289b11262c0283082479e8122cd05..070f701c2970cfd240f1703efb49dec96bec12c5 100644
Binary files a/lib/explorviz-monitoring.jar and b/lib/explorviz-monitoring.jar differ
diff --git a/release/light-RPC-application.jar b/release/light-RPC-application.jar
index 0f9acec58aa17c2be85eeeff4530a527e7645016..25d0aa3cbd6a1a9c1164e2020083dad025a21aa9 100644
Binary files a/release/light-RPC-application.jar and b/release/light-RPC-application.jar differ
diff --git a/release/start.cmd b/release/start.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..c7c203fc85054f30e0e38c8a91c0f1604ac9f36b
--- /dev/null
+++ b/release/start.cmd
@@ -0,0 +1 @@
+"C:\Program Files\Java\jdk1.7.0_75\jre\bin\java" -javaagent:aspectjweaver-1.8.5.jar -Xmx4G -Dexplorviz.live_trace_processing.system_name="testsystem" -Dexplorviz.live_trace_processing.ip_address=10.20.0.1 -Dexplorviz.live_trace_processing.host_name="testhost2" -Dexplorviz.live_trace_processing.application_name="testapp" -jar light-RPC-application.jar
\ No newline at end of file
diff --git a/src/lightrpc/LightRPCMainStarter.java b/src/lightrpc/LightRPCMainStarter.java
index dba6aeabdb1a4ebeb7a664995c8373a324e04409..2d3e0ba018d8d83fd1cc4f0401d258747eb3faa7 100644
--- a/src/lightrpc/LightRPCMainStarter.java
+++ b/src/lightrpc/LightRPCMainStarter.java
@@ -8,23 +8,13 @@ public class LightRPCMainStarter {
 
 	public static void main(String[] args) {
 		MonitoringController.isMonitoringEnabled();
-		
-		try {
-			Thread.sleep(1000);
-		} catch (InterruptedException e) {
-		}
-		
+
 		JAXWSServer.startServer(9999);
-		
+
 		JAXWSClient.accessServer(9999);
 
 		JAXWSServer.endServer();
-		
-		try {
-			Thread.sleep(1000);
-		} catch (InterruptedException e) {
-		}
-		
+
 		MonitoringController.shutdown();
 	}
 }