diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index 434f6903f..865b0301e 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
         static string slicingErrorMessage = "Slicing Error.\nPlease review your slice settings.".Localize();
         static string pressGenerateMessage = "Press 'generate' to view layers".Localize();
         static string fileNotFoundMessage = "File not found on disk.".Localize();
-		static string fileTooBigToLoad = "File too big to load.".Localize();
+		static string fileTooBigToLoad = "GCode file too big to load for '{0}'.".Localize();
 
         Vector2 bedCenter;
         Vector3 viewerVolume;
@@ -865,7 +865,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			{
 				if (GCodeFile.FileTooBigToLoad(printItem.FileLocation))
 				{
-					SetProcessingMessage(string.Format("{0}\n'{1}'", fileTooBigToLoad, Path.GetFileName(printItem.FileLocation)));
+					SetProcessingMessage(string.Format(fileTooBigToLoad, printItem.Name));
 				}
 				else
 				{
diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs
index 7f1cd9f1d..1c46fa936 100644
--- a/PrinterCommunication/PrinterConnectionAndCommunication.cs
+++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs
@@ -1941,8 +1941,15 @@ namespace MatterHackers.MatterControl.PrinterCommunication
 
                     // write data to communication
                     {
-                        StringEventArgs currentEvent = new StringEventArgs(lineToWrite);
-                        CommunicationUnconditionalToPrinter.CallEvents(this, currentEvent);
+						StringEventArgs currentEvent = new StringEventArgs(lineToWrite);
+						if (PrinterIsPrinting)
+						{
+							CommunicationUnconditionalFromPrinter.CallEvents(this, new StringEventArgs("[{0}] {1}".FormatWith(timeSinceStartedPrint.ElapsedMilliseconds, lineToWrite)));
+						}
+						else
+						{
+							CommunicationUnconditionalFromPrinter.CallEvents(this, currentEvent);
+						}
 
                         if (lineWithoutChecksum != null)
                         {
@@ -2599,8 +2606,15 @@ namespace MatterHackers.MatterControl.PrinterCommunication
 
                                     // process this command
                                     {
-                                        StringEventArgs currentEvent = new StringEventArgs(lastLineRead);
-                                        CommunicationUnconditionalFromPrinter.CallEvents(this, currentEvent);
+										StringEventArgs currentEvent = new StringEventArgs(lastLineRead);
+										if (PrinterIsPrinting)
+										{
+											CommunicationUnconditionalFromPrinter.CallEvents(this, new StringEventArgs("[{0}] {1}".FormatWith(timeSinceStartedPrint.ElapsedMilliseconds, lastLineRead)));
+										}
+										else
+										{
+											CommunicationUnconditionalFromPrinter.CallEvents(this, currentEvent);
+										}
 
                                         FoundStringEventArgs foundResponse = new FoundStringEventArgs(currentEvent.Data);
                                         ReadLineStartCallBacks.CheckForKeys(foundResponse);
diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt
index a5a122e22..8de048b2e 100644
--- a/StaticData/Translations/Master.txt
+++ b/StaticData/Translations/Master.txt
@@ -3125,3 +3125,6 @@ Translated:Clear Print History
 English:This gcode will be inserted into the output right after the temperature setting. If you have the commands to set temperature in this section they will not be generated outside of this section. You can also include values from other settings such as [temperature].
 Translated:This gcode will be inserted into the output right after the temperature setting. If you have the commands to set temperature in this section they will not be generated outside of this section. You can also include values from other settings such as [temperature].
 
+English:GCode file too big to load for '{0}'.
+Translated:GCode file too big to load for '{0}'.
+