diff --git a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
index 191429f14e..6dfdadc74c 100644
--- a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
+++ b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
@@ -65,7 +65,7 @@ namespace BizHawk.Client.EmuHawk
 			Closing += (o, e) => SaveConfigSettings();
 
 			MaxLines = 10000;
-			FileSizeCap = 100;
+			FileSizeCap = 150; // make 1 frame of tracelog for n64/psx fit in
 			_splitFile = FileSizeCap != 0;
 		}
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
index ab302315c2..704ed51515 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
@@ -10,9 +10,9 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 {
 	public partial class Octoshock
 	{
-		public TraceBuffer Tracer { get; private set; }
-
-		public static string TraceHeader = "R3000A: PC, raw bytes, mnemonic, registers (GPRs, lo, hi, sr, cause, epc)";
+		public TraceBuffer Tracer { get; private set; }
+
+		public static string TraceHeader = "R3000A: PC, machine code, mnemonic, operands, registers (GPRs, lo, hi, sr, cause, epc)";
 
 		OctoshockDll.ShockCallback_Trace trace_cb;
 
@@ -32,7 +32,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 
 			Tracer.Put(new TraceInfo
 			{
-				Disassembly = string.Format("{0:X8}:  {1:X8}  {2}", PC, inst, dis.PadRight(20)),
+				Disassembly = string.Format("{0:X8}:  {1:X8}  {2}", PC, inst, dis.PadRight(30)),
 				RegisterInfo = sb.ToString().Trim()
 			});
 		}