diff --git a/lib/nmea2ktoais/NMEA0183AISMessages.cpp b/lib/nmea2ktoais/NMEA0183AISMessages.cpp
index aa2c45b..cc37c77 100644
--- a/lib/nmea2ktoais/NMEA0183AISMessages.cpp
+++ b/lib/nmea2ktoais/NMEA0183AISMessages.cpp
@@ -245,9 +245,7 @@ bool  SetAISClassBMessage24(tNMEA0183AISMsg &NMEA0183AISMsg, uint8_t MessageID,
   uint8_t i;
   for ( i = 0; i < vships.size(); i++) {
     if ( vships[i]->_userID == UserID ) {
-      Serial.print("UserID gefunden: "); Serial.print(UserID);
       ShipName = const_cast<char*>( vships[i]->_shipName.c_str() );
-      Serial.print(" / "); Serial.println( ShipName);
     }
   }
   if ( i > MAX_SHIP_IN_VECTOR ) {
diff --git a/lib/queue/GwMessage.h b/lib/queue/GwMessage.h
index 3a6963e..18267f7 100644
--- a/lib/queue/GwMessage.h
+++ b/lib/queue/GwMessage.h
@@ -29,6 +29,8 @@ class Message{
     }
     virtual ~Message(){
       GW_MESSAGE_DEBUG("~Message %p\n",this);
+      vSemaphoreDelete(locker);
+      vSemaphoreDelete(notifier);
     }
     void unref(){
       GW_MESSAGE_DEBUG("Message::unref %p\n",this);
@@ -81,9 +83,9 @@ class RequestMessage : public Message{
   protected:
     virtual void processRequest()=0;  
     virtual void processImpl(){
-      GW_MESSAGE_DEBUG("RequestMessage processImpl(1)");
+      GW_MESSAGE_DEBUG("RequestMessage processImpl(1) %p\n",this);
       processRequest();
-      GW_MESSAGE_DEBUG("RequestMessage processImpl(2)");
+      GW_MESSAGE_DEBUG("RequestMessage processImpl(2) %p\n",this);
       len=strlen(result.c_str());
       consumed=0;
       handled=true;
@@ -92,6 +94,7 @@ class RequestMessage : public Message{
     RequestMessage():Message(){
     }
     virtual ~RequestMessage(){
+      GW_MESSAGE_DEBUG("~RequestMessage %p\n",this)
     }
     String getResult(){return result;}
     int getLen(){return len;}
diff --git a/src/main.cpp b/src/main.cpp
index a209c6c..8e71eee 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,7 +12,10 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#define VERSION "0.1.2"
+#define VERSION "0.2.0"
+//#define GW_MESSAGE_DEBUG_ENABLED
+//#define FALLBACK_SERIAL
+const unsigned long HEAP_REPORT_TIME=2000; //set to 0 to disable heap reporting
 #include "GwHardware.h"
 
 #include <Arduino.h>
@@ -223,8 +226,11 @@ void setup() {
   if (usbBaud){
     baud=usbBaud->asInt();
   }
-  int st=usbSerial.setup(baud,3,1); //TODO: PIN defines
-  //int st=-1;
+#ifdef FALLBACK_SERIAL
+  int st=-1;
+#else
+  int st=usbSerial.setup(baud,3,1); //TODO: PIN defines  
+#endif  
   if (st < 0){
     //falling back to old style serial for logging
     Serial.begin(baud);
@@ -497,11 +503,10 @@ class NMEAMessageReceiver : public GwBufferWriter{
 };
 NMEAMessageReceiver receiver;
 unsigned long lastHeapReport=0;
-const unsigned long HEAP_REPORT_TIME=2000;
 void loop() {
   gwWifi.loop();
   unsigned long now=millis();
-  if (now > (lastHeapReport+HEAP_REPORT_TIME)){
+  if (HEAP_REPORT_TIME > 0 && now > (lastHeapReport+HEAP_REPORT_TIME)){
     lastHeapReport=now;
     if (logger.isActive(GwLog::DEBUG)){
       logger.logDebug(GwLog::DEBUG,"Heap free=%ld, minFree=%ld",
@@ -526,7 +531,7 @@ void loop() {
   //handle messages from the async web server
   Message *msg=NULL;
   if (xQueueReceive(queue,&msg,0)){
-    logger.logDebug(GwLog::DEBUG,"main message");
+    logger.logDebug(GwLog::DEBUG+1,"main message");
     msg->process();
     msg->unref();
   }