diff --git a/CommonCode/src/main/java/no/iktdev/streamit/content/common/deamon/Daemon.kt b/CommonCode/src/main/java/no/iktdev/streamit/content/common/deamon/Daemon.kt
index 4538867f..a0c39d3a 100644
--- a/CommonCode/src/main/java/no/iktdev/streamit/content/common/deamon/Daemon.kt
+++ b/CommonCode/src/main/java/no/iktdev/streamit/content/common/deamon/Daemon.kt
@@ -12,7 +12,7 @@ open class Daemon(open val executable: String, val daemonInterface: IDaemon) {
     var executor: ProcessResult? = null
     open suspend fun run(parameters: List<String>): Int {
         daemonInterface.onStarted()
-        logger.info { "Daemon arguments: $executable ${parameters.joinToString(" ")}"  }
+        logger.info { "\nDaemon arguments: $executable \nParamters:\n${parameters.joinToString(" ")}"  }
         executor = process(executable, *parameters.toTypedArray(),
             stdout = Redirect.CAPTURE,
             stderr = Redirect.CAPTURE,
@@ -23,7 +23,7 @@ open class Daemon(open val executable: String, val daemonInterface: IDaemon) {
         if (resultCode == 0) {
             daemonInterface.onEnded()
         } else daemonInterface.onError(resultCode)
-        logger.info { "Daemon ended: $resultCode" }
+        logger.info { "$executable result: $resultCode" }
         return resultCode
     }
 }
\ No newline at end of file
diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/EncodeWorkConsumer.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/EncodeWorkConsumer.kt
index a783f1ca..39741a02 100644
--- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/EncodeWorkConsumer.kt
+++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/EncodeWorkConsumer.kt
@@ -50,7 +50,7 @@ class EncodeWorkConsumer(private val runnerCoordinator: RunnerCoordinator) : Def
         accepts
     ) {
         override fun onMessageReceived(data: ConsumerRecord<String, Message>) {
-            logger.info { "${data.value().referenceId}: ${data.key()} ${Gson().toJson(data.value())}" }
+            logger.info { "\nreferenceId: ${data.value().referenceId} \nEvent: ${data.key()} \nData:\n${Gson().toJson(data.value())}" }
             val message = data.value().apply {
                 this.data = EncodeWorkDeserializer().deserializeIfSuccessful(data.value())
             }
diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/ExtractWorkConsumer.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/ExtractWorkConsumer.kt
index 347bf5b7..361d2fa6 100644
--- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/ExtractWorkConsumer.kt
+++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/ExtractWorkConsumer.kt
@@ -49,7 +49,7 @@ class ExtractWorkConsumer(private val runnerCoordinator: RunnerCoordinator) : De
         accepts
     ) {
         override fun onMessageReceived(data: ConsumerRecord<String, Message>) {
-            logger.info { "${data.value().referenceId}: ${data.key()} ${Gson().toJson(data.value())}" }
+            logger.info { "\nreferenceId: ${data.value().referenceId} \nEvent: ${data.key()} \nData:\n${Gson().toJson(data.value())}" }
             val message = data.value().apply {
                 this.data = ExtractWorkDeserializer().deserializeIfSuccessful(data.value())
             }
diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt
index 03602932..0742127a 100644
--- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt
+++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt
@@ -25,6 +25,7 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte
             }
         } catch (e: Exception) {
             //logger.error { e.message }
+            e.printStackTrace()
         }
     }
 
diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt
index 9df044d8..cfac3afd 100644
--- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt
+++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt
@@ -66,17 +66,17 @@ class RunnerCoordinator {
                 val workBlock = suspend {
                     val data: EncodeWork = message.data as EncodeWork
                     val encodeDaemon = EncodeDaemon(message.referenceId, data, encodeListener)
-                    logger.info { "${message.referenceId} Starting encoding ${data.workId}" }
+                    logger.info { "\nreferenceId: ${message.referenceId} \nStarting encoding. \nWorkId: ${data.workId}" }
                     encodeDaemon.runUsingWorkItem()
                 }
                 queue.trySend(ExecutionBlock("encode", workBlock))
                 producer.sendMessage(KafkaEvents.EVENT_ENCODER_VIDEO_FILE_QUEUED.event, message.withNewStatus(Status(StatusType.SUCCESS)))
             } else {
-                producer.sendMessage(KafkaEvents.EVENT_ENCODER_VIDEO_FILE_STARTED.event, message.withNewStatus(Status(StatusType.ERROR, "Data is not an instance of EncodeWork or null")))
+                producer.sendMessage(KafkaEvents.EVENT_ENCODER_VIDEO_FILE_QUEUED.event, message.withNewStatus(Status(StatusType.ERROR, "Data is not an instance of EncodeWork or null")))
             }
         } catch (e: Exception) {
             e.printStackTrace()
-            producer.sendMessage(KafkaEvents.EVENT_ENCODER_VIDEO_FILE_STARTED.event, message.withNewStatus(Status(StatusType.ERROR, e.message)))
+            producer.sendMessage(KafkaEvents.EVENT_ENCODER_VIDEO_FILE_QUEUED.event, message.withNewStatus(Status(StatusType.ERROR, e.message)))
         }
     }
 
@@ -87,17 +87,17 @@ class RunnerCoordinator {
                 val workBlock = suspend {
                     val data: ExtractWork = message.data as ExtractWork
                     val extractDaemon = ExtractDaemon(message.referenceId, data, extractListener)
-                    logger.info { "${message.referenceId} Starting extraction ${data.workId}" }
+                    logger.info { "\nreferenceId: ${message.referenceId} \nStarting extracting. \nWorkId: ${data.workId}" }
                     extractDaemon.runUsingWorkItem()
                 }
                 queue.trySend(ExecutionBlock("extract", workBlock))
                 producer.sendMessage(KafkaEvents.EVENT_ENCODER_SUBTITLE_FILE_QUEUED.event, message.withNewStatus(Status(StatusType.SUCCESS)))
             } else {
-                producer.sendMessage(KafkaEvents.EVENT_ENCODER_SUBTITLE_FILE_STARTED.event, message.withNewStatus(Status(StatusType.ERROR, "Data is not an instance of ExtractWork")))
+                producer.sendMessage(KafkaEvents.EVENT_ENCODER_SUBTITLE_FILE_QUEUED.event, message.withNewStatus(Status(StatusType.ERROR, "Data is not an instance of ExtractWork")))
             }
         } catch (e: Exception) {
             e.printStackTrace()
-            producer.sendMessage(KafkaEvents.EVENT_ENCODER_SUBTITLE_FILE_STARTED.event, message.withNewStatus(Status(StatusType.ERROR, e.message)))
+            producer.sendMessage(KafkaEvents.EVENT_ENCODER_SUBTITLE_FILE_QUEUED.event, message.withNewStatus(Status(StatusType.ERROR, e.message)))
         }
     }
 
@@ -107,12 +107,12 @@ class RunnerCoordinator {
 
     val encodeListener = object: IEncodeListener {
         override fun onStarted(referenceId: String, work: EncodeWork) {
-            logger.info { "Work started for $referenceId with WorkId ${work.workId} @ ${work.outFile}" }
+            logger.info { "\nreferenceId: $referenceId \nWorkId ${work.workId}  \nEncode: Started\n${work.outFile}" }
             producer.sendMessage(KafkaEvents.EVENT_ENCODER_VIDEO_FILE_STARTED.event, Message(referenceId, Status(statusType =  StatusType.SUCCESS), work))
         }
 
         override fun onError(referenceId: String, work: EncodeWork, code: Int) {
-            logger.error { "Work failed for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Error $code" }
+            logger.error { "\nreferenceId: $referenceId \nWorkId ${work.workId}  \nEncode: Failed\n${work.outFile} \nError: $code" }
             producer.sendMessage(KafkaEvents.EVENT_ENCODER_VIDEO_FILE_ENDED.event, Message(referenceId, Status(StatusType.ERROR, message = code.toString()), work))
         }
 
@@ -121,24 +121,25 @@ class RunnerCoordinator {
         }
 
         override fun onEnded(referenceId: String, work: EncodeWork) {
-            logger.info { "Work ended for $referenceId with WorkId ${work.workId} @ ${work.outFile}" }
+            logger.info { "\nreferenceId: $referenceId \nWorkId ${work.workId}  \nEncode: Ended\n${work.outFile}" }
             producer.sendMessage(KafkaEvents.EVENT_ENCODER_VIDEO_FILE_ENDED.event, Message(referenceId, Status(statusType =  StatusType.SUCCESS), work))
         }
     }
 
     val extractListener = object : IExtractListener {
         override fun onStarted(referenceId: String, work: ExtractWork) {
-            logger.info { "Work started for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Started" }
+            logger.info { "\nreferenceId: $referenceId \nWorkId ${work.workId}  \nExtract: Started\n${work.outFile}" }
             producer.sendMessage(KafkaEvents.EVENT_ENCODER_SUBTITLE_FILE_STARTED.event, Message(referenceId, Status(statusType =  StatusType.SUCCESS), work))
         }
 
         override fun onError(referenceId: String, work: ExtractWork, code: Int) {
-            logger.error { "Work failed for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Error $code" }
+            logger.error { "\nreferenceId: $referenceId \nWorkId ${work.workId}  \nExtract: Failed\n${work.outFile} \nError: $code" }
+
             producer.sendMessage(KafkaEvents.EVENT_ENCODER_SUBTITLE_FILE_ENDED.event, Message(referenceId, Status(StatusType.ERROR, code.toString()), work))
         }
 
         override fun onEnded(referenceId: String, work: ExtractWork) {
-            logger.info { "Work ended for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Ended" }
+            logger.info { "\nreferenceId: $referenceId \nWorkId ${work.workId}  \nExtract: Ended\n${work.outFile}" }
             producer.sendMessage(KafkaEvents.EVENT_ENCODER_SUBTITLE_FILE_ENDED.event, Message(referenceId, Status(statusType =  StatusType.SUCCESS), work))
         }