diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 1cbad7c..4d9663b 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -42,7 +42,8 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+        ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	; ShowBitmap "$IconFile$" $ProductId$
 	
 	if FileExists("%ScriptPath%\delsub32.ins")
 		comment "Start uninstall sub section"
@@ -89,7 +90,7 @@ endif
 ;
 ; === MSI package =======================================================================================
 ; You may use the parameter PIDKEY=$Licensekey$
-msiexec /i "%ScriptPath%\itWESS-Client_German.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress CONFIGURATIONPATH="%ScriptPath%\custom\custom.cfg"
+msiexec /i "$Msi32$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress CONFIGURATIONPATH="%ScriptPath%\custom\custom.cfg"
 
 
 [Files_install]
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index e22901d..e058572 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -32,6 +32,7 @@ Set $LicensePool$     = "p_" + $ProductId$
 
 comment "Show product picture"
 ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+;ShowBitmap "$IconFile$" $ProductId$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
diff --git a/builder-product.cfg b/builder-product.cfg
index bccd5c7..dded51e 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -19,9 +19,9 @@ DL_FILE[0]="267005.jpg"
 DL_SOURCE[0]="http://www.pressebox.de/pr-images/267005.jpg"
 
 DL_FILE[1]="itWESS-Client_German.msi"
-DL_SOURCE[1]="http://ivyrepos.dtnet.de/v-$PN/itwatch/itwatch/4.10.19/itWESS-Client_German.msi;http://internal.graz.disconnected-by-peer.at/Orig/itWatch/itWESS/HB/4.10.19/itWESS-Client_German.msi"
+DL_SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/itWatch/itWESS/HB/4.10.19/itWESS-Client_German.msi"
 DL_ARCH[1]="X86"
-DL_WINST_NAME[1]=itWESS
+DL_WINST_NAME[1]=Msi32
 
 #DL_FILE[2]="itWESS-64bit_German.msi"
 #DL_SOURCE[2]="http://ivyrepos.dtnet.de/itwatch/itwatch/4.10.19/itWESS-64bit_German.msi;http://internal.graz.disconnected-by-peer.at/Orig/itWatch/itWESS/HB/4.10.19/itWESS-64bit_German.msi"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 6525a3e..af186a7 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -8,45 +8,7 @@
 #
 ##############################################################################
 
-#function config() {
-#    echo "Config" 
-#    builder_config
-#}
-
-#function prepare() { 
-#    echo "Prepare" 
-#    builder_prepare
-#}
-
-function retrieve() { 
-    echo "Retrieve" 
-    builder_retrieve
-}
-
-function create() { 
-    echo  "Create"
-    builder_create
-}
-
-function package() { 
-    echo "Package" 
-    builder_package
-}
-
-function cb_package_makeproductfile() {
-    echo "May add/replace files to the files to $inst_dir"
-}
-
-function publish() {
-    echo "Publish"
-    builder_publish
-}
-
-function commit() {
-    echo "Commit"
-    # builder_commit
-}
 function cleanup() {
     echo "Cleanup: output_dir: $output_dir"
-    # builder_cleanup
+    builder_cleanup
 }