diff --git a/source/Cosmos.Build.Windows/DebugWindow.xaml b/source/Cosmos.Build.Windows/DebugWindow.xaml
index 53c8de441..f37370dfe 100644
--- a/source/Cosmos.Build.Windows/DebugWindow.xaml
+++ b/source/Cosmos.Build.Windows/DebugWindow.xaml
@@ -29,6 +29,7 @@
                     <Button Name="butnTest">Test</Button>
                 </ToolBar>
             </ToolBarTray>
+            <Label Name="lablSourceFilename" DockPanel.Dock="Top"></Label>
             <FlowDocumentScrollViewer Name="fdsvSource" />
         </DockPanel>
     </DockPanel>
diff --git a/source/Cosmos.Build.Windows/DebugWindow.xaml.cs b/source/Cosmos.Build.Windows/DebugWindow.xaml.cs
index 09c08ce26..816470117 100644
--- a/source/Cosmos.Build.Windows/DebugWindow.xaml.cs
+++ b/source/Cosmos.Build.Windows/DebugWindow.xaml.cs
@@ -77,6 +77,7 @@ namespace Cosmos.Build.Windows {
 
         public void LoadSourceFile(string aPathname) {
             var xSourceCode = System.IO.File.ReadAllLines(aPathname);
+            lablSourceFilename.Content = System.IO.Path.GetFileName(aPathname);
             var xPara = new Paragraph();
             mLines.Clear();
             fdsvSource.Document = new FlowDocument();
diff --git a/source/Cosmos/Cosmos.Hardware/PC/Global.cs b/source/Cosmos/Cosmos.Hardware/PC/Global.cs
index a385b5859..f6e5993af 100644
--- a/source/Cosmos/Cosmos.Hardware/PC/Global.cs
+++ b/source/Cosmos/Cosmos.Hardware/PC/Global.cs
@@ -23,14 +23,20 @@ namespace Cosmos.Hardware.PC {
 			HW.PC.Bus.PCIBus.Init();
 
             // end partially new
-			if (!noATA) HW.Storage.ATA.Initialize(Sleep);
-			if (!noATAOld) HW.Storage.ATAOld.Initialize(Sleep);
+            if (!noATA) {
+                HW.Storage.ATA.Initialize(Sleep);
+            }
+            if (!noATAOld) {
+                HW.Storage.ATAOld.Initialize(Sleep);
+            }
 			
             HW.CPU.CreateIDT();
             // end old -----------------
 
 			// MTW new
-			if (!noATA2) HW.Storage.ATA2.ATA.Initialize(Sleep);
+            if (!noATA2) {
+                HW.Storage.ATA2.ATA.Initialize(Sleep);
+            }
 			// MTW new end
 
             HW.Device.Add(new Bus.CPU.Keyboard());
@@ -47,7 +53,7 @@ namespace Cosmos.Hardware.PC {
         }
 
         private static void Tick(object aSender, EventArgs aEventArgs) {
-            TickCount += 1;
+            TickCount++;
         }   
 
         //TODO: Change this to use an x86 Op or something so it doesnt
diff --git a/source/Indy.IL2CPU.Assembler.X86/Assembler.cs b/source/Indy.IL2CPU.Assembler.X86/Assembler.cs
index cda1b4d17..c9fa076e5 100644
--- a/source/Indy.IL2CPU.Assembler.X86/Assembler.cs
+++ b/source/Indy.IL2CPU.Assembler.X86/Assembler.cs
@@ -184,8 +184,8 @@ namespace Indy.IL2CPU.Assembler.X86 {
                         new Ret();
                     }
                 }
+                aOutputWriter.WriteLine(xAsm.GetContents());
             }
-            aOutputWriter.WriteLine(xAsm.GetContents());
         }
 
 		protected override void EmitDataSectionHeader(string aGroup, TextWriter aOutputWriter) {