diff --git a/src/ZoneCodeGeneratorLib/Generating/CodeGenerator.cpp b/src/ZoneCodeGeneratorLib/Generating/CodeGenerator.cpp
index c5571b33..41b766f6 100644
--- a/src/ZoneCodeGeneratorLib/Generating/CodeGenerator.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/CodeGenerator.cpp
@@ -88,6 +88,7 @@ bool CodeGenerator::GenerateCode(IDataRepository* repository)
             assets.push_back(info);
     }
 
+    const auto start = std::chrono::steady_clock::now();
     for (const auto& generationTask : m_args->m_generation_tasks)
     {
         auto templateName = generationTask.m_template_name;
@@ -107,7 +108,12 @@ bool CodeGenerator::GenerateCode(IDataRepository* repository)
             {
                 auto context = RenderingContext::BuildContext(repository, asset);
                 if (!GenerateCodeForTemplate(context.get(), foundTemplate->second.get()))
+                {
+                    std::cout << "Failed to generate code for asset '" << asset->m_definition->GetFullName() << "' with preset '" << foundTemplate->first << "'\n";
                     return false;
+                }
+                
+                std::cout << "Successfully generated code for asset '" << asset->m_definition->GetFullName() << "' with preset '" << foundTemplate->first << "'\n";
             }
         }
         else
@@ -121,6 +127,11 @@ bool CodeGenerator::GenerateCode(IDataRepository* repository)
                 return false;
         }
     }
+    const auto end = std::chrono::steady_clock::now();
+    if (m_args->m_verbose)
+    {
+        std::cout << "Generating code took " << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << "ms" << std::endl;
+    }
 
     return true;
 }
diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/CommandsFileReader.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/CommandsFileReader.cpp
index 8c3d0528..8b44e176 100644
--- a/src/ZoneCodeGeneratorLib/Parsing/Commands/CommandsFileReader.cpp
+++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/CommandsFileReader.cpp
@@ -64,7 +64,10 @@ void CommandsFileReader::SetupPostProcessors()
 
 bool CommandsFileReader::ReadCommandsFile(IDataRepository* repository)
 {
-    std::cout << "Reading commands file: " << m_filename << std::endl;
+    if(m_args->m_verbose)
+    {
+        std::cout << "Reading commands file: " << m_filename << std::endl;
+    }
 
     if (!OpenBaseStream())
         return false;
@@ -77,7 +80,11 @@ bool CommandsFileReader::ReadCommandsFile(IDataRepository* repository)
     const auto start = std::chrono::steady_clock::now();
     const auto result = parser->Parse();
     const auto end = std::chrono::steady_clock::now();
-    std::cout << "Processing commands took " << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << "ms" << std::endl;
+
+    if(m_args->m_verbose)
+    {
+        std::cout << "Processing commands took " << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << "ms" << std::endl;
+    }
 
     if (!result)
         return false;
diff --git a/src/ZoneCodeGeneratorLib/Parsing/Header/HeaderFileReader.cpp b/src/ZoneCodeGeneratorLib/Parsing/Header/HeaderFileReader.cpp
index a3036f6e..c724fc93 100644
--- a/src/ZoneCodeGeneratorLib/Parsing/Header/HeaderFileReader.cpp
+++ b/src/ZoneCodeGeneratorLib/Parsing/Header/HeaderFileReader.cpp
@@ -64,7 +64,10 @@ void HeaderFileReader::SetupPostProcessors()
 
 bool HeaderFileReader::ReadHeaderFile(IDataRepository* repository)
 {
-    std::cout << "Reading header file: " << m_filename << std::endl;
+    if (m_args->m_verbose)
+    {
+        std::cout << "Reading header file: " << m_filename << std::endl;
+    }
 
     if (!OpenBaseStream())
         return false;
@@ -79,7 +82,11 @@ bool HeaderFileReader::ReadHeaderFile(IDataRepository* repository)
     if (result)
         result = parser->SaveToRepository(repository);
     const auto end = std::chrono::steady_clock::now();
-    std::cout << "Processing header took " << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << "ms" << std::endl;
+
+    if(m_args->m_verbose)
+    {
+        std::cout << "Processing header took " << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << "ms" << std::endl;
+    }
 
     if (!result)
         return false;