diff --git a/data/cronjob b/data/cronjob
index d081467..2d7cd93 100644
--- a/data/cronjob
+++ b/data/cronjob
@@ -1,3 +1,3 @@
 # Cronjob DDNS Updater ipv64.net
 */15 * * * * /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1
-*/30 * * * * sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S`  Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1
+*/30 * * * * sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S`  IP CHECK    - Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1
diff --git a/data/ddns-update.sh b/data/ddns-update.sh
index 4e9d1ba..9d09b2a 100644
--- a/data/ddns-update.sh
+++ b/data/ddns-update.sh
@@ -8,12 +8,12 @@ sleep 1
 
 if [ "$IP" == "$UPDIP" ]; then
     echo
-    echo "$DATUM  KEIN UPDATE - Aktuelle IP=$UPDIP"
+    echo "$DATUM  KEIN UPDATE - Aktuelle IP= $UPDIP"
     echo
 else
     echo
     echo "$DATUM  UPDATE !!! ..."
-    echo "$DATUM  UPDATE !!!  - Update IP= $IP - Alte-IP: $UPDIP"
+    echo "$DATUM  UPDATE !!!  - Update IP= $IP - Alte-IP= $UPDIP"
     sleep 1
     echo "$IP" > $PFAD/updip.txt
     echo
@@ -31,20 +31,20 @@ DOMAIN_CHECK=$(dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net)
 sleep 1
 if [ "$IP" == "$DOMAIN_CHECK" ]; then
     echo
-    echo "$DATUM  CHECK       - DOMAIN HAT DEN IP EINTRAG: `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
+    echo "$DATUM  CHECK       - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
     echo
 else
     echo
     echo "$DATUM  UPDATE !!! ..."
-    echo "$DATUM  UPDATE !!!  - NACHEINTAG DIE IP WIRD NOCH EINMAL GESETZT"
-    echo "$DATUM  UPDATE !!!  - Update IP= $IP - Alte-IP: $UPDIP"
+    echo "$DATUM  UPDATE !!!  - NACHEINTRAG DIE IP WIRD NOCH EINMAL GESETZT"
+    echo "$DATUM  UPDATE !!!  - Update IP= $IP - Alte-IP= $UPDIP"
     sleep 5
     echo
     curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}"
     # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>
     sleep 15
     echo
-    echo "$DATUM  NACHEINTAG  - DOMAIN HAT DEN IP EINTRAG: `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
+    echo "$DATUM  NACHEINTRAG - DOMAIN HAT DEN IP EINTRAG= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
     echo
 fi
 }
diff --git a/data/entrypoint.sh b/data/entrypoint.sh
index eaa0284..923c013 100644
--- a/data/entrypoint.sh
+++ b/data/entrypoint.sh
@@ -1,7 +1,17 @@
 #!/usr/bin/env bash
 # set -x
 set -e
+# cleanup
+cleanup() {
+    echo "================================  STOP DDNS UPDATER IPV64.NET ================================"
+}
+
+# Trap SIGTERM
+trap 'cleanup' SIGTERM
+
+echo -n "" > /var/log/cron.log
 sleep 10
+
 echo "================================ START DDNS UPDATER IPV64.NET ================================"
 
 if [ -z "${DOMAIN_KEY:-}" ] ; then
@@ -43,7 +53,7 @@ fi
 echo "${IP}" > /data/updip.txt
 curl -sSL --fail https://ipv64.net/ > /dev/null || exit 1
 echo "${CRON_TIME} /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1" > /etc/cron.d/container_cronjob
-echo "$CRON_TIME_DIG" 'sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S`  Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1' >> /etc/cron.d/container_cronjob
+echo "$CRON_TIME_DIG" 'sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S`  IP CHECK    - Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1' >> /etc/cron.d/container_cronjob
 
 sleep 2
 
@@ -51,4 +61,6 @@ sleep 2
 /usr/sbin/crond
 
 set tail -f /var/log/cron.log "$@"
-exec "$@"
+exec "$@" &
+
+wait $!