diff --git a/src/main.ts b/src/main.ts
index 64bba43..7a17a24 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -42,21 +42,12 @@ class MqttMongo extends Events.EventEmitter {
 
   connectToDatabase() {
     console.info("About to connect to database")
-    Mongo.MongoClient.connect(this.options['database'], 
-    {
-//      'server': {
-//        'reconnectTries': 5,
-//        'reconnectInterval': 1000,
-//        'socketOptions': {
-//          'autoReconnect': false
-//        }
-//      }  
-    })
+    Mongo.MongoClient.connect(this.options['database']) 
       .then(
         (tmpDbHandle: Mongo.Db) => { 
           this.dbHandle = tmpDbHandle
           this.dbReady = true; 
-          console.info("Connected to database")
+          console.info("Database connected")
           this.dbHandle.on('reconnectFailed', (err : any) => { console.warn(`Error on database ${err}`) })
           this.dbHandle.on('reconnect', () => { 
             console.info("Reconnect on database") 
@@ -111,7 +102,7 @@ class MqttMongo extends Events.EventEmitter {
     this.mqttClient.on('close', () => { console.warn("MQTT connection closed") })
 
     this.mqttClient.on('connect', () => {
-      console.info("Connected to MQTT broker")
+      console.info("MQTT broker connected")
       this.mqttClient.subscribe(options['topic'])
       this.mqttClient.subscribe('MqttMongo/Command')
       this.mqttClient.publish('MqttMongo/Status', 'hello, started up')
@@ -143,6 +134,7 @@ class MqttMongo extends Events.EventEmitter {
         this.emit("reconnectDatabase")
       }
     }, 1000)
+    console.info("Heartbeat timer started")
   }
 
   shutdown() {