diff --git a/2Term.xcodeproj/kelvin.pbxuser b/2Term.xcodeproj/kelvin.pbxuser
index cda3054..bd97e97 100644
--- a/2Term.xcodeproj/kelvin.pbxuser
+++ b/2Term.xcodeproj/kelvin.pbxuser
@@ -34,7 +34,7 @@
 			B676069511DEC97D00D6B66C /* TermWindowController.m:97 */,
 			B67606B011DECD4E00D6B66C /* TermWindowController.m:97 */,
 			B676070811DF8F4100D6B66C /* TermWindowController.m:97 */,
-			B65FA27911E29E8D00EB447E /* EmulatorView.mm:97 */,
+			B65FA27911E29E8D00EB447E /* EmulatorView.mm:93 */,
 			B649E13D11E2BC7A0061921F /* VT52View.mm:460 */,
 			B649E15211E2BF130061921F /* VT52View.mm:107 */,
 			B649E17111E2C3C50061921F /* VT52View.mm:598 */,
@@ -46,8 +46,8 @@
 			B66979AB11E6A8B4002ED475 /* VT52.mm:278 */,
 			B66979AE11E6A8C5002ED475 /* VT52.mm:272 */,
 			B66979B111E6A8D0002ED475 /* VT52.mm:240 */,
-			B66979E511E6BD8B002ED475 /* EmulatorView.mm:36 */,
-			B60EBD4E11E8DF0D00C1974F /* EmulatorView.mm:59 */,
+			B66979E511E6BD8B002ED475 /* EmulatorView.mm:35 */,
+			B60EBD4E11E8DF0D00C1974F /* EmulatorView.mm:55 */,
 			B60EBE0511E916BD00C1974F /* ScanLineFilter.m:23 */,
 			B60EBE0711E916C000C1974F /* ScanLineFilter.m:24 */,
 		);
@@ -80,6 +80,34 @@
 					PBXBreakpointsDataSource_ContinueID,
 				);
 			};
+			PBXConfiguration.PBXFileTableDataSource3.PBXBookmarksDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXBookmarksDataSource_NameID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					200,
+					200,
+					284.58349609375,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXBookmarksDataSource_LocationID,
+					PBXBookmarksDataSource_NameID,
+					PBXBookmarksDataSource_CommentsID,
+				);
+			};
+			PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					22,
+					300,
+					363,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXExecutablesDataSource_ActiveFlagID,
+					PBXExecutablesDataSource_NameID,
+					PBXExecutablesDataSource_CommentsID,
+				);
+			};
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
 				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
@@ -124,93 +152,29 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 300409198;
-			PBXWorkspaceStateSaveDate = 300409198;
+			PBXPerProjectTemplateStateSaveDate = 300554910;
+			PBXWorkspaceStateSaveDate = 300554910;
 		};
 		perUserProjectItems = {
-			B60EBCED11E7F6BE00C1974F /* PBXTextBookmark */ = B60EBCED11E7F6BE00C1974F /* PBXTextBookmark */;
-			B60EBCEE11E7F6BE00C1974F /* PBXTextBookmark */ = B60EBCEE11E7F6BE00C1974F /* PBXTextBookmark */;
-			B60EBCEF11E7F6BE00C1974F /* PBXTextBookmark */ = B60EBCEF11E7F6BE00C1974F /* PBXTextBookmark */;
-			B60EBCF011E7F6BE00C1974F /* PBXTextBookmark */ = B60EBCF011E7F6BE00C1974F /* PBXTextBookmark */;
-			B60EBCFF11E7F73B00C1974F /* PBXTextBookmark */ = B60EBCFF11E7F73B00C1974F /* PBXTextBookmark */;
-			B60EBD0611E8DEB000C1974F /* PBXTextBookmark */ = B60EBD0611E8DEB000C1974F /* PBXTextBookmark */;
-			B60EBD5211E8DF1200C1974F /* PBXTextBookmark */ = B60EBD5211E8DF1200C1974F /* PBXTextBookmark */;
-			B60EBD5511E8DF1700C1974F /* PBXTextBookmark */ = B60EBD5511E8DF1700C1974F /* PBXTextBookmark */;
-			B60EBD5811E8DFE300C1974F /* PBXTextBookmark */ = B60EBD5811E8DFE300C1974F /* PBXTextBookmark */;
-			B60EBD5C11E8E12F00C1974F /* PBXTextBookmark */ = B60EBD5C11E8E12F00C1974F /* PBXTextBookmark */;
-			B60EBD6011E8E18E00C1974F /* PBXTextBookmark */ = B60EBD6011E8E18E00C1974F /* PBXTextBookmark */;
-			B60EBD6411E8E1A000C1974F /* PBXTextBookmark */ = B60EBD6411E8E1A000C1974F /* PBXTextBookmark */;
-			B60EBD6611E8E1B000C1974F /* PBXTextBookmark */ = B60EBD6611E8E1B000C1974F /* PBXTextBookmark */;
-			B60EBD6911E8E1C500C1974F /* PBXTextBookmark */ = B60EBD6911E8E1C500C1974F /* PBXTextBookmark */;
-			B60EBD6B11E8EBE200C1974F /* PBXTextBookmark */ = B60EBD6B11E8EBE200C1974F /* PBXTextBookmark */;
-			B60EBD6E11E8FB0200C1974F /* PBXTextBookmark */ = B60EBD6E11E8FB0200C1974F /* PBXTextBookmark */;
-			B60EBD7511E8FB4A00C1974F /* PBXTextBookmark */ = B60EBD7511E8FB4A00C1974F /* PBXTextBookmark */;
-			B60EBD7711E8FB6500C1974F /* PBXTextBookmark */ = B60EBD7711E8FB6500C1974F /* PBXTextBookmark */;
-			B60EBD7A11E8FBA300C1974F /* PBXTextBookmark */ = B60EBD7A11E8FBA300C1974F /* PBXTextBookmark */;
-			B60EBD7E11E8FBC000C1974F /* PBXTextBookmark */ = B60EBD7E11E8FBC000C1974F /* PBXTextBookmark */;
-			B60EBD8211E8FBE900C1974F /* PBXTextBookmark */ = B60EBD8211E8FBE900C1974F /* PBXTextBookmark */;
-			B60EBD8611E8FBF500C1974F /* PBXTextBookmark */ = B60EBD8611E8FBF500C1974F /* PBXTextBookmark */;
-			B60EBD8A11E8FC2B00C1974F /* PBXTextBookmark */ = B60EBD8A11E8FC2B00C1974F /* PBXTextBookmark */;
-			B60EBD8E11E8FC3400C1974F /* PBXTextBookmark */ = B60EBD8E11E8FC3400C1974F /* PBXTextBookmark */;
-			B60EBD9411E8FC5000C1974F /* PBXTextBookmark */ = B60EBD9411E8FC5000C1974F /* PBXTextBookmark */;
-			B60EBD9811E8FC9100C1974F /* PBXTextBookmark */ = B60EBD9811E8FC9100C1974F /* PBXTextBookmark */;
-			B60EBD9C11E8FCA300C1974F /* PBXTextBookmark */ = B60EBD9C11E8FCA300C1974F /* PBXTextBookmark */;
-			B60EBDA011E8FCB900C1974F /* PBXTextBookmark */ = B60EBDA011E8FCB900C1974F /* PBXTextBookmark */;
-			B60EBDA411E8FCCB00C1974F /* PBXTextBookmark */ = B60EBDA411E8FCCB00C1974F /* PBXTextBookmark */;
-			B60EBDA811E8FCDE00C1974F /* PBXTextBookmark */ = B60EBDA811E8FCDE00C1974F /* PBXTextBookmark */;
-			B60EBDAC11E8FCE900C1974F /* PBXTextBookmark */ = B60EBDAC11E8FCE900C1974F /* PBXTextBookmark */;
-			B60EBDB011E8FD3200C1974F /* PBXTextBookmark */ = B60EBDB011E8FD3200C1974F /* PBXTextBookmark */;
-			B60EBDB411E8FD4100C1974F /* PBXTextBookmark */ = B60EBDB411E8FD4100C1974F /* PBXTextBookmark */;
-			B60EBDB811E9065600C1974F /* PBXTextBookmark */ = B60EBDB811E9065600C1974F /* PBXTextBookmark */;
-			B60EBDBE11E9073200C1974F /* PBXTextBookmark */ = B60EBDBE11E9073200C1974F /* PBXTextBookmark */;
-			B60EBDC211E9074A00C1974F /* PBXTextBookmark */ = B60EBDC211E9074A00C1974F /* PBXTextBookmark */;
-			B60EBDC611E9075800C1974F /* PBXTextBookmark */ = B60EBDC611E9075800C1974F /* PBXTextBookmark */;
-			B60EBDDE11E90FA900C1974F /* PBXTextBookmark */ = B60EBDDE11E90FA900C1974F /* PBXTextBookmark */;
-			B60EBDDF11E90FA900C1974F /* PBXTextBookmark */ = B60EBDDF11E90FA900C1974F /* PBXTextBookmark */;
-			B60EBDE011E90FA900C1974F /* PBXTextBookmark */ = B60EBDE011E90FA900C1974F /* PBXTextBookmark */;
-			B60EBDFA11E916AE00C1974F /* PBXTextBookmark */ = B60EBDFA11E916AE00C1974F /* PBXTextBookmark */;
-			B60EBDFB11E916AE00C1974F /* PBXTextBookmark */ = B60EBDFB11E916AE00C1974F /* PBXTextBookmark */;
-			B60EBDFC11E916AE00C1974F /* PBXTextBookmark */ = B60EBDFC11E916AE00C1974F /* PBXTextBookmark */;
-			B60EBDFD11E916AE00C1974F /* PBXTextBookmark */ = B60EBDFD11E916AE00C1974F /* PBXTextBookmark */;
-			B60EBDFE11E916AE00C1974F /* PBXTextBookmark */ = B60EBDFE11E916AE00C1974F /* PBXTextBookmark */;
-			B60EBDFF11E916AE00C1974F /* PBXTextBookmark */ = B60EBDFF11E916AE00C1974F /* PBXTextBookmark */;
-			B60EBE0011E916AE00C1974F /* PBXTextBookmark */ = B60EBE0011E916AE00C1974F /* PBXTextBookmark */;
-			B60EBE0911E916C300C1974F /* PBXTextBookmark */ = B60EBE0911E916C300C1974F /* PBXTextBookmark */;
-			B60EBE0D11E916CF00C1974F /* PBXTextBookmark */ = B60EBE0D11E916CF00C1974F /* PBXTextBookmark */;
-			B60EBE0F11E916D900C1974F /* PBXTextBookmark */ = B60EBE0F11E916D900C1974F /* PBXTextBookmark */;
-			B60EBE1011E916E900C1974F /* PBXTextBookmark */ = B60EBE1011E916E900C1974F /* PBXTextBookmark */;
-			B60EBE1111E916E900C1974F /* PBXTextBookmark */ = B60EBE1111E916E900C1974F /* PBXTextBookmark */;
-			B60EBE1211E916E900C1974F /* PBXTextBookmark */ = B60EBE1211E916E900C1974F /* PBXTextBookmark */;
-			B60EBE1311E9170000C1974F /* PBXTextBookmark */ = B60EBE1311E9170000C1974F /* PBXTextBookmark */;
-			B60EBE1411E9170000C1974F /* PBXTextBookmark */ = B60EBE1411E9170000C1974F /* PBXTextBookmark */;
-			B60EBE1511E9170000C1974F /* PBXTextBookmark */ = B60EBE1511E9170000C1974F /* PBXTextBookmark */;
-			B60EBE1611E9170000C1974F /* PBXTextBookmark */ = B60EBE1611E9170000C1974F /* PBXTextBookmark */;
-			B60EBE2111E917AA00C1974F /* PBXTextBookmark */ = B60EBE2111E917AA00C1974F /* PBXTextBookmark */;
-			B60EBE2211E917AA00C1974F /* PBXTextBookmark */ = B60EBE2211E917AA00C1974F /* PBXTextBookmark */;
-			B60EBE3111E918E700C1974F /* PBXTextBookmark */ = B60EBE3111E918E700C1974F /* PBXTextBookmark */;
-			B60EBE3211E918E700C1974F /* PBXTextBookmark */ = B60EBE3211E918E700C1974F /* PBXTextBookmark */;
-			B60EBE3311E918EC00C1974F /* PBXTextBookmark */ = B60EBE3311E918EC00C1974F /* PBXTextBookmark */;
-			B60EBE3411E918EC00C1974F /* PBXTextBookmark */ = B60EBE3411E918EC00C1974F /* PBXTextBookmark */;
-			B60EBE3511E918EC00C1974F /* PBXTextBookmark */ = B60EBE3511E918EC00C1974F /* PBXTextBookmark */;
-			B60EBE3711E9190000C1974F /* PBXTextBookmark */ = B60EBE3711E9190000C1974F /* PBXTextBookmark */;
-			B60EBE3811E9191000C1974F /* PBXTextBookmark */ = B60EBE3811E9191000C1974F /* PBXTextBookmark */;
-			B60EBE3911E9191D00C1974F /* PBXTextBookmark */ = B60EBE3911E9191D00C1974F /* PBXTextBookmark */;
-			B60EBE3C11E9192B00C1974F /* PBXTextBookmark */ = B60EBE3C11E9192B00C1974F /* PBXTextBookmark */;
-			B60EBE4011E9196100C1974F /* PBXTextBookmark */ = B60EBE4011E9196100C1974F /* PBXTextBookmark */;
-			B60EBE4411E9196F00C1974F /* PBXTextBookmark */ = B60EBE4411E9196F00C1974F /* PBXTextBookmark */;
-			B60EBE4611E9197800C1974F /* PBXTextBookmark */ = B60EBE4611E9197800C1974F /* PBXTextBookmark */;
-			B60EBE4911E9198800C1974F /* PBXTextBookmark */ = B60EBE4911E9198800C1974F /* PBXTextBookmark */;
-			B60EBE4D11E919C600C1974F /* PBXTextBookmark */ = B60EBE4D11E919C600C1974F /* PBXTextBookmark */;
-			B60EBE5111E919E800C1974F /* PBXTextBookmark */ = B60EBE5111E919E800C1974F /* PBXTextBookmark */;
-			B60EBE5511E919FC00C1974F /* PBXTextBookmark */ = B60EBE5511E919FC00C1974F /* PBXTextBookmark */;
-			B60EBE5911E91A8800C1974F /* PBXTextBookmark */ = B60EBE5911E91A8800C1974F /* PBXTextBookmark */;
+			B602375711E94C2900C0B73E = B602375711E94C2900C0B73E /* PBXTextBookmark */;
+			B60EBCED11E7F6BE00C1974F = B60EBCED11E7F6BE00C1974F /* PBXTextBookmark */;
+			B60EBDFA11E916AE00C1974F = B60EBDFA11E916AE00C1974F /* PBXTextBookmark */;
+			B60EBDFB11E916AE00C1974F = B60EBDFB11E916AE00C1974F /* PBXTextBookmark */;
+			B60EBDFC11E916AE00C1974F = B60EBDFC11E916AE00C1974F /* PBXTextBookmark */;
+			B60EBE1311E9170000C1974F = B60EBE1311E9170000C1974F /* PBXTextBookmark */;
+			B60EBE3311E918EC00C1974F = B60EBE3311E918EC00C1974F /* PBXTextBookmark */;
+			B60EBE6211E91C5900C1974F = B60EBE6211E91C5900C1974F /* PBXTextBookmark */;
+			B60EBE6311E91C5900C1974F = B60EBE6311E91C5900C1974F /* PBXTextBookmark */;
+			B60EBE6711E91E1E00C1974F = B60EBE6711E91E1E00C1974F /* PBXTextBookmark */;
+			B641C82311EA1B1600B6359F /* PBXTextBookmark */ = B641C82311EA1B1600B6359F /* PBXTextBookmark */;
+			B641C82411EA1B1600B6359F /* XCBuildMessageTextBookmark */ = B641C82411EA1B1600B6359F /* XCBuildMessageTextBookmark */;
+			B641C82511EA1B1600B6359F /* PBXTextBookmark */ = B641C82511EA1B1600B6359F /* PBXTextBookmark */;
 			B649E0B511E2A88D0061921F = B649E0B511E2A88D0061921F /* PBXTextBookmark */;
 			B65FA28111E29EDE00EB447E = B65FA28111E29EDE00EB447E /* PBXTextBookmark */;
 			B65FA2FE11E2A5D200EB447E = B65FA2FE11E2A5D200EB447E /* PBXTextBookmark */;
 			B669796311E6A606002ED475 = B669796311E6A606002ED475 /* PBXTextBookmark */;
 			B669797711E6A6CE002ED475 = B669797711E6A6CE002ED475 /* PBXTextBookmark */;
 			B66979BD11E6ACB9002ED475 = B66979BD11E6ACB9002ED475 /* PBXTextBookmark */;
-			B66979FE11E6BEC3002ED475 = B66979FE11E6BEC3002ED475 /* PBXTextBookmark */;
 			B6697A1A11E6C28A002ED475 = B6697A1A11E6C28A002ED475 /* PBXBookmark */;
 			B6697A1B11E6C28A002ED475 = B6697A1B11E6C28A002ED475 /* PBXTextBookmark */;
 			B6697A5211E7E072002ED475 = B6697A5211E7E072002ED475 /* PBXTextBookmark */;
@@ -222,14 +186,11 @@
 			B6697A5811E7E072002ED475 = B6697A5811E7E072002ED475 /* PBXTextBookmark */;
 			B6697A5911E7E072002ED475 = B6697A5911E7E072002ED475 /* PBXTextBookmark */;
 			B6697A5A11E7E072002ED475 = B6697A5A11E7E072002ED475 /* PBXTextBookmark */;
-			B6697A5B11E7E072002ED475 = B6697A5B11E7E072002ED475 /* PBXTextBookmark */;
-			B6697A6311E7E0F3002ED475 = B6697A6311E7E0F3002ED475 /* PBXTextBookmark */;
 			B676058811DAE21100D6B66C = B676058811DAE21100D6B66C /* PBXTextBookmark */;
 			B676058911DAE21100D6B66C = B676058911DAE21100D6B66C /* PBXTextBookmark */;
 			B676058B11DAE21100D6B66C = B676058B11DAE21100D6B66C /* PlistBookmark */;
 			B676058C11DAE21100D6B66C = B676058C11DAE21100D6B66C /* PBXTextBookmark */;
 			B676060711DD4FA600D6B66C = B676060711DD4FA600D6B66C /* PBXTextBookmark */;
-			B676062F11DE96AE00D6B66C = B676062F11DE96AE00D6B66C /* PBXTextBookmark */;
 			B676064811DEB80600D6B66C = B676064811DEB80600D6B66C /* PBXTextBookmark */;
 			B67606C811DED91C00D6B66C = B67606C811DED91C00D6B66C /* PBXTextBookmark */;
 			B699A0BE11E58D3B00F54CC8 = B699A0BE11E58D3B00F54CC8 /* PBXTextBookmark */;
@@ -253,6 +214,16 @@
 			B676053511DADB8100D6B66C /* 2Term */,
 		);
 	};
+	B602375711E94C2900C0B73E /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B6697A3C11E7CCA0002ED475 /* PTSE.mm */;
+		name = "PTSE.mm: 273";
+		rLen = 0;
+		rLoc = 7640;
+		rType = 0;
+		vrLen = 773;
+		vrLoc = 6154;
+	};
 	B60EBCED11E7F6BE00C1974F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B699A02E11E528BC00F54CC8 /* Screen.h */;
@@ -263,57 +234,7 @@
 		vrLen = 946;
 		vrLoc = 454;
 	};
-	B60EBCEE11E7F6BE00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 30";
-		rLen = 0;
-		rLoc = 514;
-		rType = 0;
-		vrLen = 542;
-		vrLoc = 217;
-	};
-	B60EBCEF11E7F6BE00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 47";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 538;
-		vrLoc = 391;
-	};
-	B60EBCF011E7F6BE00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 558;
-		vrLoc = 391;
-	};
-	B60EBCFF11E7F73B00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 558;
-		vrLoc = 391;
-	};
-	B60EBD0611E8DEB000C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD4E11E8DF0D00C1974F /* EmulatorView.mm:59 */ = {
+	B60EBD4E11E8DF0D00C1974F /* EmulatorView.mm:55 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
 		);
@@ -325,349 +246,12 @@
 		functionName = "-awakeFromNib";
 		hitCount = 0;
 		ignoreCount = 0;
-		lineNumber = 59;
+		lineNumber = 55;
 		location = 2Term;
-		modificationTime = 300489351.787828;
+		modificationTime = 300555018.859059;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
-	B60EBD5211E8DF1200C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD5511E8DF1700C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD5811E8DFE300C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD5C11E8E12F00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD6011E8E18E00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD6411E8E1A000C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD6611E8E1B000C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD6911E8E1C500C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD6B11E8EBE200C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD6E11E8FB0200C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 558;
-		vrLoc = 391;
-	};
-	B60EBD7511E8FB4A00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD7711E8FB6500C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 558;
-		vrLoc = 391;
-	};
-	B60EBD7A11E8FBA300C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD7E11E8FBC000C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD8211E8FBE900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD8611E8FBF500C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD8A11E8FC2B00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD8E11E8FC3400C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD9411E8FC5000C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD9811E8FC9100C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBD9C11E8FCA300C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDA011E8FCB900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDA411E8FCCB00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDA811E8FCDE00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDAC11E8FCE900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDB011E8FD3200C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDB411E8FD4100C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDB811E9065600C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDBE11E9073200C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDC211E9074A00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDC611E9075800C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 557;
-		vrLoc = 391;
-	};
-	B60EBDDE11E90FA900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
-		name = "EmulatorView.h: 48";
-		rLen = 0;
-		rLoc = 745;
-		rType = 0;
-		vrLen = 320;
-		vrLoc = 581;
-	};
-	B60EBDDF11E90FA900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		rLen = 0;
-		rLoc = 58;
-		rType = 1;
-	};
-	B60EBDE011E90FA900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 76";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 552;
-		vrLoc = 6937;
-	};
 	B60EBDE111E90FC300C1974F /* ScanLineFilter.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {780, 1018}}";
@@ -677,9 +261,9 @@
 	};
 	B60EBDE211E90FC300C1974F /* ScanLineFilter.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {653, 1092}}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 1001}}";
 			sepNavSelRange = "{363, 0}";
-			sepNavVisRange = "{144, 725}";
+			sepNavVisRange = "{227, 561}";
 		};
 	};
 	B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */ = {
@@ -694,7 +278,7 @@
 		fRef = B67606D811DF6DAB00D6B66C /* EmulatorView.h */;
 		name = "EmulatorView.h: 48";
 		rLen = 0;
-		rLoc = 745;
+		rLoc = 721;
 		rType = 0;
 		vrLen = 558;
 		vrLoc = 391;
@@ -719,46 +303,6 @@
 		vrLen = 309;
 		vrLoc = 0;
 	};
-	B60EBDFD11E916AE00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 75";
-		rLen = 0;
-		rLoc = 2035;
-		rType = 0;
-		vrLen = 736;
-		vrLoc = 172;
-	};
-	B60EBDFE11E916AE00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */;
-		name = "ScanLineFilter.cikernel: 20";
-		rLen = 0;
-		rLoc = 396;
-		rType = 0;
-		vrLen = 396;
-		vrLoc = 0;
-	};
-	B60EBDFF11E916AE00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 76";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 804;
-		vrLoc = 6785;
-	};
-	B60EBE0011E916AE00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 61";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 839;
-		vrLoc = 6572;
-	};
 	B60EBE0511E916BD00C1974F /* ScanLineFilter.m:23 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
@@ -773,7 +317,7 @@
 		ignoreCount = 0;
 		lineNumber = 23;
 		location = 2Term;
-		modificationTime = 300489351.788241;
+		modificationTime = 300555018.859328;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -791,147 +335,20 @@
 		ignoreCount = 0;
 		lineNumber = 24;
 		location = 2Term;
-		modificationTime = 300489351.788637;
+		modificationTime = 300555018.859525;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
-	B60EBE0911E916C300C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 61";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 839;
-		vrLoc = 6572;
-	};
-	B60EBE0D11E916CF00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 61";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 839;
-		vrLoc = 6572;
-	};
-	B60EBE0F11E916D900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 61";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 839;
-		vrLoc = 6572;
-	};
-	B60EBE1011E916E900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 61";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 510;
-		vrLoc = 6572;
-	};
-	B60EBE1111E916E900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		rLen = 0;
-		rLoc = 23;
-		rType = 1;
-	};
-	B60EBE1211E916E900C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 638;
-		vrLoc = 227;
-	};
 	B60EBE1311E9170000C1974F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
 		name = "EmulatorView.mm: 61";
 		rLen = 0;
-		rLoc = 1317;
+		rLoc = 1180;
 		rType = 0;
 		vrLen = 919;
 		vrLoc = 6572;
 	};
-	B60EBE1411E9170000C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 762;
-		vrLoc = 144;
-	};
-	B60EBE1511E9170000C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */;
-		name = "ScanLineFilter.cikernel: 20";
-		rLen = 0;
-		rLoc = 396;
-		rType = 0;
-		vrLen = 396;
-		vrLoc = 0;
-	};
-	B60EBE1611E9170000C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */;
-		name = "ScanLineFilter.cikernel: 20";
-		rLen = 0;
-		rLoc = 396;
-		rType = 0;
-		vrLen = 396;
-		vrLoc = 0;
-	};
-	B60EBE2111E917AA00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */;
-		name = "ScanLineFilter.cikernel: 20";
-		rLen = 0;
-		rLoc = 396;
-		rType = 0;
-		vrLen = 396;
-		vrLoc = 0;
-	};
-	B60EBE2211E917AA00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */;
-		name = "ScanLineFilter.cikernel: 20";
-		rLen = 0;
-		rLoc = 396;
-		rType = 0;
-		vrLen = 396;
-		vrLoc = 0;
-	};
-	B60EBE3111E918E700C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */;
-		name = "ScanLineFilter.cikernel: 20";
-		rLen = 0;
-		rLoc = 396;
-		rType = 0;
-		vrLen = 396;
-		vrLoc = 0;
-	};
-	B60EBE3211E918E700C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */;
-		name = "ScanLineFilter.cikernel: 20";
-		rLen = 0;
-		rLoc = 396;
-		rType = 0;
-		vrLen = 396;
-		vrLoc = 0;
-	};
 	B60EBE3311E918EC00C1974F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */;
@@ -942,142 +359,62 @@
 		vrLen = 396;
 		vrLoc = 0;
 	};
-	B60EBE3411E918EC00C1974F /* PBXTextBookmark */ = {
+	B60EBE6211E91C5900C1974F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
+		name = "ScanLineFilter.m: 24";
 		rLen = 0;
-		rLoc = 23;
+		rLoc = 363;
+		rType = 0;
+		vrLen = 725;
+		vrLoc = 144;
+	};
+	B60EBE6311E91C5900C1974F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		comments = "Incomplete implementation of class 'PTSE'";
+		fRef = B6697A3C11E7CCA0002ED475 /* PTSE.mm */;
+		rLen = 1;
+		rLoc = 272;
 		rType = 1;
 	};
-	B60EBE3511E918EC00C1974F /* PBXTextBookmark */ = {
+	B60EBE6711E91E1E00C1974F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
+		fRef = B6697A3C11E7CCA0002ED475 /* PTSE.mm */;
+		name = "PTSE.mm: 273";
 		rLen = 0;
-		rLoc = 363;
+		rLoc = 7640;
 		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
+		vrLen = 802;
+		vrLoc = 6125;
 	};
-	B60EBE3711E9190000C1974F /* PBXTextBookmark */ = {
+	B641C82311EA1B1600B6359F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
+		fRef = B6697A3C11E7CCA0002ED475 /* PTSE.mm */;
+		name = "PTSE.mm: 238";
 		rLen = 0;
-		rLoc = 363;
+		rLoc = 6823;
 		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
+		vrLen = 399;
+		vrLoc = 0;
 	};
-	B60EBE3811E9191000C1974F /* PBXTextBookmark */ = {
+	B641C82411EA1B1600B6359F /* XCBuildMessageTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 610;
-		vrLoc = 144;
+		comments = "'struct iSize' has no member named 'x'";
+		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
+		fallbackIsa = XCBuildMessageTextBookmark;
+		rLen = 1;
+		rLoc = 325;
+		rType = 1;
 	};
-	B60EBE3911E9191D00C1974F /* PBXTextBookmark */ = {
+	B641C82511EA1B1600B6359F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
+		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
+		name = "EmulatorView.mm: 326";
 		rLen = 0;
-		rLoc = 363;
+		rLoc = 7364;
 		rType = 0;
-		vrLen = 727;
-		vrLoc = 144;
-	};
-	B60EBE3C11E9192B00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
-	};
-	B60EBE4011E9196100C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
-	};
-	B60EBE4411E9196F00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
-	};
-	B60EBE4611E9197800C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
-	};
-	B60EBE4911E9198800C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
-	};
-	B60EBE4D11E919C600C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
-	};
-	B60EBE5111E919E800C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
-	};
-	B60EBE5511E919FC00C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
-	};
-	B60EBE5911E91A8800C1974F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */;
-		name = "ScanLineFilter.m: 24";
-		rLen = 0;
-		rLoc = 363;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 144;
+		vrLen = 741;
+		vrLoc = 7021;
 	};
 	B649E0B511E2A88D0061921F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -1103,7 +440,7 @@
 		ignoreCount = 0;
 		lineNumber = 460;
 		location = 2Term;
-		modificationTime = 300489351.780744;
+		modificationTime = 300555018.856882;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1121,7 +458,7 @@
 		ignoreCount = 0;
 		lineNumber = 107;
 		location = 2Term;
-		modificationTime = 300489351.784356;
+		modificationTime = 300555018.857066;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1139,7 +476,7 @@
 		ignoreCount = 0;
 		lineNumber = 598;
 		location = 2Term;
-		modificationTime = 300489351.784665;
+		modificationTime = 300555018.857268;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1157,7 +494,7 @@
 		ignoreCount = 0;
 		lineNumber = 607;
 		location = 2Term;
-		modificationTime = 300489351.785062;
+		modificationTime = 300555018.857428;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1175,7 +512,7 @@
 		ignoreCount = 0;
 		lineNumber = 170;
 		location = 2Term;
-		modificationTime = 300489351.785309;
+		modificationTime = 300555018.857585;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1193,11 +530,11 @@
 		ignoreCount = 0;
 		lineNumber = 113;
 		location = 2Term;
-		modificationTime = 300489351.785543;
+		modificationTime = 300555018.857761;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
-	B65FA27911E29E8D00EB447E /* EmulatorView.mm:97 */ = {
+	B65FA27911E29E8D00EB447E /* EmulatorView.mm:93 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
 		);
@@ -1209,9 +546,9 @@
 		functionName = "-drawRect:";
 		hitCount = 0;
 		ignoreCount = 0;
-		lineNumber = 97;
+		lineNumber = 93;
 		location = 2Term;
-		modificationTime = 300489351.761641;
+		modificationTime = 300555018.856565;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1247,7 +584,7 @@
 		fRef = B699A03211E528DE00F54CC8 /* iGeometry.h */;
 		name = "iGeometry.h: 55";
 		rLen = 0;
-		rLoc = 983;
+		rLoc = 1066;
 		rType = 0;
 		vrLen = 577;
 		vrLoc = 406;
@@ -1290,7 +627,7 @@
 		ignoreCount = 0;
 		lineNumber = 184;
 		location = 2Term;
-		modificationTime = 300489351.785801;
+		modificationTime = 300555018.857943;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1308,7 +645,7 @@
 		ignoreCount = 0;
 		lineNumber = 183;
 		location = 2Term;
-		modificationTime = 300489351.786039;
+		modificationTime = 300555018.858106;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1326,7 +663,7 @@
 		ignoreCount = 0;
 		lineNumber = 278;
 		location = 2Term;
-		modificationTime = 300489351.78628;
+		modificationTime = 300555018.858284;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1344,7 +681,7 @@
 		ignoreCount = 0;
 		lineNumber = 272;
 		location = 2Term;
-		modificationTime = 300489351.786564;
+		modificationTime = 300555018.85845;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1362,7 +699,7 @@
 		ignoreCount = 0;
 		lineNumber = 240;
 		location = 2Term;
-		modificationTime = 300489351.786827;
+		modificationTime = 300555018.858617;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1376,7 +713,14 @@
 		vrLen = 320;
 		vrLoc = 0;
 	};
-	B66979E511E6BD8B002ED475 /* EmulatorView.mm:36 */ = {
+	B66979CF11E6BCAE002ED475 /* sl25.png */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = image.png;
+		name = sl25.png;
+		path = /Users/kelvin/Projects/2Term/images/sl25.png;
+		sourceTree = "<absolute>";
+	};
+	B66979E511E6BD8B002ED475 /* EmulatorView.mm:35 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
 		);
@@ -1388,22 +732,12 @@
 		functionName = "-awakeFromNib";
 		hitCount = 0;
 		ignoreCount = 0;
-		lineNumber = 36;
+		lineNumber = 35;
 		location = 2Term;
-		modificationTime = 300489351.787372;
+		modificationTime = 300555018.858791;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
-	B66979FE11E6BEC3002ED475 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B67606D911DF6DAB00D6B66C /* EmulatorView.mm */;
-		name = "EmulatorView.mm: 30";
-		rLen = 0;
-		rLoc = 514;
-		rType = 0;
-		vrLen = 541;
-		vrLoc = 218;
-	};
 	B6697A0D11E6BF95002ED475 /* CurveView.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1249, 955}}";
@@ -1441,9 +775,9 @@
 	};
 	B6697A3C11E7CCA0002ED475 /* PTSE.mm */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {685, 3354}}";
-			sepNavSelRange = "{1207, 0}";
-			sepNavVisRange = "{508, 2373}";
+			sepNavIntBoundsRect = "{{0, 0}, {653, 3939}}";
+			sepNavSelRange = "{6823, 0}";
+			sepNavVisRange = "{0, 399}";
 		};
 	};
 	B6697A5211E7E072002ED475 /* PBXTextBookmark */ = {
@@ -1536,26 +870,6 @@
 		vrLen = 387;
 		vrLoc = 0;
 	};
-	B6697A5B11E7E072002ED475 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B699A02E11E528BC00F54CC8 /* Screen.h */;
-		name = "Screen.h: 22";
-		rLen = 0;
-		rLoc = 304;
-		rType = 0;
-		vrLen = 475;
-		vrLoc = 135;
-	};
-	B6697A6311E7E0F3002ED475 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = B699A02E11E528BC00F54CC8 /* Screen.h */;
-		name = "Screen.h: 22";
-		rLen = 0;
-		rLoc = 304;
-		rType = 0;
-		vrLen = 952;
-		vrLoc = 454;
-	};
 	B676053511DADB8100D6B66C /* 2Term */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
@@ -1667,16 +981,6 @@
 		vrLen = 522;
 		vrLoc = 0;
 	};
-	B676062F11DE96AE00D6B66C /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 256AC3D80F4B6AC300CF3369 /* TwoTermAppDelegate.h */;
-		name = "TwoTermAppDelegate.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 397;
-		vrLoc = 0;
-	};
 	B676063911DEAD3500D6B66C /* TermWindowController.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1249, 978}}";
@@ -1686,9 +990,9 @@
 	};
 	B676063A11DEAD3500D6B66C /* TermWindowController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {653, 1261}}";
+			sepNavIntBoundsRect = "{{0, 0}, {780, 1287}}";
 			sepNavSelRange = "{492, 0}";
-			sepNavVisRange = "{948, 685}";
+			sepNavVisRange = "{0, 1582}";
 		};
 	};
 	B676064811DEB80600D6B66C /* PBXTextBookmark */ = {
@@ -1715,7 +1019,7 @@
 		ignoreCount = 0;
 		lineNumber = 34;
 		location = 2Term;
-		modificationTime = 300489351.759988;
+		modificationTime = 300555018.855333;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1733,7 +1037,7 @@
 		ignoreCount = 0;
 		lineNumber = 31;
 		location = 2Term;
-		modificationTime = 300489351.760567;
+		modificationTime = 300555018.855899;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1751,7 +1055,7 @@
 		ignoreCount = 0;
 		lineNumber = 97;
 		location = 2Term;
-		modificationTime = 300489351.760836;
+		modificationTime = 300555018.856067;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1769,7 +1073,7 @@
 		ignoreCount = 0;
 		lineNumber = 97;
 		location = 2Term;
-		modificationTime = 300489351.761139;
+		modificationTime = 300555018.856226;
 		originalNumberOfMultipleMatches = 1;
 		state = 2;
 	};
@@ -1800,16 +1104,16 @@
 	};
 	B67606D811DF6DAB00D6B66C /* EmulatorView.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {653, 832}}";
-			sepNavSelRange = "{745, 0}";
-			sepNavVisRange = "{391, 558}";
+			sepNavIntBoundsRect = "{{0, 0}, {780, 1018}}";
+			sepNavSelRange = "{873, 0}";
+			sepNavVisRange = "{0, 966}";
 		};
 	};
 	B67606D911DF6DAB00D6B66C /* EmulatorView.mm */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {761, 4147}}";
-			sepNavSelRange = "{1240, 0}";
-			sepNavVisRange = "{6572, 919}";
+			sepNavIntBoundsRect = "{{0, 0}, {653, 4459}}";
+			sepNavSelRange = "{7364, 0}";
+			sepNavVisRange = "{7021, 741}";
 		};
 	};
 	B676070811DF8F4100D6B66C /* TermWindowController.m:97 */ = {
@@ -1826,7 +1130,7 @@
 		ignoreCount = 0;
 		lineNumber = 97;
 		location = 2Term;
-		modificationTime = 300489351.761385;
+		modificationTime = 300555018.856391;
 		originalNumberOfMultipleMatches = 1;
 		state = 0;
 	};
diff --git a/2Term.xcodeproj/kelvin.perspectivev3 b/2Term.xcodeproj/kelvin.perspectivev3
index deadc5c..a4021e0 100644
--- a/2Term.xcodeproj/kelvin.perspectivev3
+++ b/2Term.xcodeproj/kelvin.perspectivev3
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>ActivePerspectiveName</key>
-	<string>Debug</string>
+	<string>Project</string>
 	<key>AllowedModules</key>
 	<array>
 		<dict>
@@ -278,23 +278,16 @@
 								<string>1058C7A2FEA54F0111CA2CBB</string>
 								<string>19C28FACFE9D520D11CA2CBB</string>
 								<string>1C37FBAC04509CD000000102</string>
-								<string>B60EBE2E11E918E700C1974F</string>
-								<string>B60EBE2F11E918E700C1974F</string>
-								<string>1DDD58140DA1D0A300B32029</string>
-								<string>B676065011DEBAE900D6B66C</string>
-								<string>B60EBE3011E918E700C1974F</string>
 								<string>1C77FABC04509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
 									<integer>44</integer>
-									<integer>43</integer>
-									<integer>42</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 131}, {324, 843}}</string>
+							<string>{{0, 0}, {324, 843}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -310,6 +303,8 @@
 							<string>MainColumn</string>
 							<real>324</real>
 						</array>
+						<key>RubberWindowFrame</key>
+						<string>534 89 1060 902 0 0 1920 1178 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -325,7 +320,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>B676054211DADB9000D6B66C</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>ScanLineFilter.m</string>
+								<string>EmulatorView.mm</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -333,11 +328,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>B676054311DADB9000D6B66C</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>ScanLineFilter.m</string>
+										<string>EmulatorView.mm</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>B60EBE5911E91A8800C1974F</string>
+										<string>B641C82511EA1B1600B6359F</string>
 										<key>history</key>
 										<array>
 											<string>B676058811DAE21100D6B66C</string>
@@ -356,7 +351,6 @@
 											<string>B669796311E6A606002ED475</string>
 											<string>B669797711E6A6CE002ED475</string>
 											<string>B66979BD11E6ACB9002ED475</string>
-											<string>B6697A1A11E6C28A002ED475</string>
 											<string>B6697A1B11E6C28A002ED475</string>
 											<string>B6697A5211E7E072002ED475</string>
 											<string>B6697A5311E7E072002ED475</string>
@@ -371,9 +365,10 @@
 											<string>B60EBDFA11E916AE00C1974F</string>
 											<string>B60EBDFB11E916AE00C1974F</string>
 											<string>B60EBDFC11E916AE00C1974F</string>
-											<string>B60EBE1311E9170000C1974F</string>
 											<string>B60EBE3311E918EC00C1974F</string>
-											<string>B60EBE3411E918EC00C1974F</string>
+											<string>B60EBE6211E91C5900C1974F</string>
+											<string>B641C82311EA1B1600B6359F</string>
+											<string>B641C82411EA1B1600B6359F</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -387,16 +382,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {714, 444}}</string>
+								<string>{{0, 0}, {714, 424}}</string>
+								<key>RubberWindowFrame</key>
+								<string>534 89 1060 902 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>444pt</string>
+							<string>424pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>412pt</string>
+							<string>432pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -410,7 +407,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {714, 385}}</string>
+										<string>{{10, 27}, {714, 405}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -485,7 +482,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {714, 385}}</string>
+										<string>{{10, 27}, {714, 405}}</string>
+										<key>RubberWindowFrame</key>
+										<string>534 89 1060 902 0 0 1920 1178 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -513,11 +512,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>B60EBCF111E7F6BE00C1974F</string>
+				<string>B641C82611EA1B1600B6359F</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>B60EBCF211E7F6BE00C1974F</string>
+				<string>B641C82711EA1B1600B6359F</string>
 				<string>B676054211DADB9000D6B66C</string>
-				<string>B60EBCF311E7F6BE00C1974F</string>
+				<string>B641C82811EA1B1600B6359F</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -558,8 +557,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
@@ -571,8 +568,6 @@
 					<dict>
 						<key>Frame</key>
 						<string>{{0, 0}, {1060, 279}}</string>
-						<key>RubberWindowFrame</key>
-						<string>363 -152 1060 902 0 0 1920 1178 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXDebugCLIModule</string>
@@ -647,11 +642,7 @@
 							</array>
 							<key>Frame</key>
 							<string>{{517, 0}, {543, 281}}</string>
-							<key>RubberWindowFrame</key>
-							<string>363 -152 1060 902 0 0 1920 1178 </string>
 						</dict>
-						<key>RubberWindowFrame</key>
-						<string>363 -152 1060 902 0 0 1920 1178 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXDebugSessionModule</string>
@@ -674,14 +665,14 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>B60EBCF411E7F6BE00C1974F</string>
+				<string>B641C82911EA1B1600B6359F</string>
 				<string>1CCC7628064C1048000F2A68</string>
 				<string>1CCC7629064C1048000F2A68</string>
-				<string>B60EBCF511E7F6BE00C1974F</string>
-				<string>B60EBCF611E7F6BE00C1974F</string>
-				<string>B60EBCF711E7F6BE00C1974F</string>
-				<string>B60EBCF811E7F6BE00C1974F</string>
-				<string>B60EBCF911E7F6BE00C1974F</string>
+				<string>B641C82A11EA1B1600B6359F</string>
+				<string>B641C82B11EA1B1600B6359F</string>
+				<string>B641C82C11EA1B1600B6359F</string>
+				<string>B641C82D11EA1B1600B6359F</string>
+				<string>B641C82E11EA1B1600B6359F</string>
 			</array>
 			<key>ToolbarConfigUserDefaultsMinorVersion</key>
 			<string>2</string>
@@ -715,15 +706,14 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>B60EBE5A11E91A8800C1974F</string>
-		<string>B60EBD0811E8DEB000C1974F</string>
-		<string>B60EBD0911E8DEB000C1974F</string>
-		<string>B60EBCFC11E7F6BE00C1974F</string>
+		<string>B641C82F11EA1B1600B6359F</string>
+		<string>B641C83011EA1B1600B6359F</string>
+		<string>B641C83111EA1B1600B6359F</string>
+		<string>B641C83211EA1B1600B6359F</string>
 		<string>/Users/kelvin/Projects/2Term/2Term.xcodeproj</string>
-		<string>B60EBCFA11E7F6BE00C1974F</string>
 	</array>
 	<key>WindowString</key>
-	<string>363 -152 1060 902 0 0 1920 1178 </string>
+	<string>534 89 1060 902 0 0 1920 1178 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -1096,7 +1086,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D5B069F1CE1000CFCEE</string>
-				<string>B649E1EA11E2DC510061921F</string>
+				<string>B60EBE6811E91E1E00C1974F</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
diff --git a/2Term.xcodeproj/project.pbxproj b/2Term.xcodeproj/project.pbxproj
index 71b7d53..43180d4 100644
--- a/2Term.xcodeproj/project.pbxproj
+++ b/2Term.xcodeproj/project.pbxproj
@@ -12,14 +12,12 @@
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		B602376211E94D9800C0B73E /* iGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B602376111E94D9800C0B73E /* iGeometry.cpp */; };
 		B60EBD1211E8DEEF00C1974F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B60EBD1111E8DEEF00C1974F /* QuartzCore.framework */; };
 		B60EBDE311E90FC300C1974F /* ScanLineFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = B60EBDE211E90FC300C1974F /* ScanLineFilter.m */; };
 		B60EBDE811E9143F00C1974F /* ScanLineFilter.cikernel in Sources */ = {isa = PBXBuildFile; fileRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */; };
 		B60EBE2B11E918D500C1974F /* ScanLineFilter.cikernel in Resources */ = {isa = PBXBuildFile; fileRef = B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */; };
 		B669798511E6A786002ED475 /* Lock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B669798411E6A786002ED475 /* Lock.cpp */; };
-		B66979D111E6BCAE002ED475 /* sl25.png in Resources */ = {isa = PBXBuildFile; fileRef = B66979CF11E6BCAE002ED475 /* sl25.png */; };
-		B66979FA11E6BEB5002ED475 /* sl75.png in Resources */ = {isa = PBXBuildFile; fileRef = B66979F811E6BEB5002ED475 /* sl75.png */; };
-		B66979FB11E6BEB5002ED475 /* sl50.png in Resources */ = {isa = PBXBuildFile; fileRef = B66979F911E6BEB5002ED475 /* sl50.png */; };
 		B6697A0F11E6BF95002ED475 /* CurveView.m in Sources */ = {isa = PBXBuildFile; fileRef = B6697A0E11E6BF95002ED475 /* CurveView.m */; };
 		B6697A3D11E7CCA0002ED475 /* PTSE.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6697A3C11E7CCA0002ED475 /* PTSE.mm */; };
 		B676063B11DEAD3500D6B66C /* TermWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B676063A11DEAD3500D6B66C /* TermWindowController.m */; };
@@ -56,15 +54,13 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* TwoTerm-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TwoTerm-Info.plist"; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* 2Term.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 2Term.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		B602376111E94D9800C0B73E /* iGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iGeometry.cpp; sourceTree = "<group>"; };
 		B60EBD1111E8DEEF00C1974F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
 		B60EBDE111E90FC300C1974F /* ScanLineFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScanLineFilter.h; sourceTree = "<group>"; };
 		B60EBDE211E90FC300C1974F /* ScanLineFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScanLineFilter.m; sourceTree = "<group>"; };
 		B60EBDE711E9143F00C1974F /* ScanLineFilter.cikernel */ = {isa = PBXFileReference; explicitFileType = sourcecode.glsl; fileEncoding = 4; path = ScanLineFilter.cikernel; sourceTree = "<group>"; };
 		B669798311E6A786002ED475 /* Lock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lock.h; sourceTree = "<group>"; };
 		B669798411E6A786002ED475 /* Lock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lock.cpp; sourceTree = "<group>"; };
-		B66979CF11E6BCAE002ED475 /* sl25.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sl25.png; sourceTree = "<group>"; };
-		B66979F811E6BEB5002ED475 /* sl75.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sl75.png; sourceTree = "<group>"; };
-		B66979F911E6BEB5002ED475 /* sl50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sl50.png; sourceTree = "<group>"; };
 		B6697A0D11E6BF95002ED475 /* CurveView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurveView.h; sourceTree = "<group>"; };
 		B6697A0E11E6BF95002ED475 /* CurveView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CurveView.m; sourceTree = "<group>"; };
 		B6697A3B11E7CCA0002ED475 /* PTSE.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PTSE.h; sourceTree = "<group>"; };
@@ -113,6 +109,7 @@
 				B6EBE2B311E0EA9100EA0458 /* CharacterGenerator.h */,
 				B6EBE2B411E0EA9100EA0458 /* CharacterGenerator.m */,
 				B699A03211E528DE00F54CC8 /* iGeometry.h */,
+				B602376111E94D9800C0B73E /* iGeometry.cpp */,
 				B6697A0D11E6BF95002ED475 /* CurveView.h */,
 				B6697A0E11E6BF95002ED475 /* CurveView.m */,
 				B60EBDE111E90FC300C1974F /* ScanLineFilter.h */,
@@ -196,9 +193,6 @@
 		B66979CE11E6BCAE002ED475 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				B66979F811E6BEB5002ED475 /* sl75.png */,
-				B66979F911E6BEB5002ED475 /* sl50.png */,
-				B66979CF11E6BCAE002ED475 /* sl25.png */,
 			);
 			path = images;
 			sourceTree = "<group>";
@@ -278,9 +272,6 @@
 				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
 				B676065111DEBAE900D6B66C /* TermWindow.xib in Resources */,
-				B66979D111E6BCAE002ED475 /* sl25.png in Resources */,
-				B66979FA11E6BEB5002ED475 /* sl75.png in Resources */,
-				B66979FB11E6BEB5002ED475 /* sl50.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -305,6 +296,7 @@
 				B6697A3D11E7CCA0002ED475 /* PTSE.mm in Sources */,
 				B60EBDE311E90FC300C1974F /* ScanLineFilter.m in Sources */,
 				B60EBDE811E9143F00C1974F /* ScanLineFilter.cikernel in Sources */,
+				B602376211E94D9800C0B73E /* iGeometry.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/EmulatorView.h b/EmulatorView.h
index 392c655..9f008a2 100644
--- a/EmulatorView.h
+++ b/EmulatorView.h
@@ -44,9 +44,7 @@
     CGFloat _paddingLeft;
     CGFloat _paddingRight;
     
-    
-    NSColor *_scanLine;
-    
+        
 #ifdef __cplusplus
     
     Screen _screen;
@@ -56,6 +54,7 @@
 
 -(void)startBackgroundReader;
 -(void)dataAvailable;
+-(void)invalidateIRect: (iRect)rect;
 
 @property (nonatomic, assign) int fd;
 //@property (nonatomic, assign) iPoint cursor;
diff --git a/EmulatorView.mm b/EmulatorView.mm
index e1530cd..8f63075 100644
--- a/EmulatorView.mm
+++ b/EmulatorView.mm
@@ -25,7 +25,6 @@
 
 -(void)awakeFromNib
 {
-    NSImage *image;
     CIFilter *filter;
     NSMutableArray *filters;
     
@@ -33,9 +32,6 @@
     _charHeight = 16;
     
     
-    image = [NSImage imageNamed: @"sl25.png"];
-    
-    _scanLine = [[NSColor colorWithPatternImage: image] retain];
     
     _foregroundColor = [[NSColor greenColor] retain];
     _backgroundColor = [[NSColor blackColor] retain];
@@ -210,7 +206,6 @@
 {
     close(_fd);
     
-    [_scanLine release];
     [_foregroundColor release];
     [_backgroundColor release];
     
@@ -224,8 +219,16 @@
 -(void)keyDown:(NSEvent *)theEvent
 {
     OutputChannel channel(_fd);
+    iRect updateRect; // should be nil but whatever...
+    
+    
+    _screen.beginUpdate();
     
     [_emulator keyDown: theEvent screen: &_screen output: &channel];
+    
+    updateRect = _screen.endUpdate();
+    
+    [self invalidateIRect: updateRect];
 }
 
 -(void)startBackgroundReader
@@ -283,7 +286,6 @@
     {
         NSAutoreleasePool *pool;
         iRect updateRect;
-        CGRect rect;
         uint8_t buffer[512];
         ssize_t size;
         
@@ -310,24 +312,35 @@
         
         updateRect = _screen.endUpdate();    
         
-        rect.origin.x = updateRect.origin.x;
-        rect.origin.y = updateRect.origin.y;
-        rect.size.width = updateRect.size.width;
-        rect.size.height = updateRect.size.height;
-        
-        rect.origin.x *= _charWidth;
-        rect.origin.y *= _charHeight;
-        rect.size.width *= _charWidth;
-        rect.size.height *= _charHeight;
-
-        rect.origin.x += _paddingLeft;
-        rect.origin.y += _paddingTop;
-        
-        [self setNeedsDisplayInRect: rect];
+        [self invalidateIRect: updateRect];
         
         [pool release];
     }
 }
 
 
+-(void)invalidateIRect: (iRect)updateRect
+{
+    NSRect rect;
+    
+    if (updateRect.size.width <= 0 || updateRect.size.height <= 0) return;
+    
+    rect.origin.x = updateRect.origin.x;
+    rect.origin.y = updateRect.origin.y;
+    rect.size.width = updateRect.size.width;
+    rect.size.height = updateRect.size.height;
+    
+    rect.origin.x *= _charWidth;
+    rect.origin.y *= _charHeight;
+    rect.size.width *= _charWidth;
+    rect.size.height *= _charHeight;
+    
+    rect.origin.x += _paddingLeft;
+    rect.origin.y += _paddingTop;
+    
+    [self setNeedsDisplayInRect: rect];    
+    
+}
+
+
 @end
diff --git a/PTSE.mm b/PTSE.mm
index 5376fc9..874b833 100644
--- a/PTSE.mm
+++ b/PTSE.mm
@@ -235,4 +235,39 @@ enum  {
 }
 
 
+-(void)keyDown:(NSEvent *)event screen:(Screen *)screen output:(OutputChannel *)output
+{
+    unsigned flags = [event modifierFlags];
+    NSString *chars = [event charactersIgnoringModifiers];
+    
+    unsigned length = [chars length];
+    
+    for (unsigned i = 0; i < length; ++i)
+    {
+        unichar uc = [chars characterAtIndex: i];
+        
+        switch (uc)
+        {
+            case NSLeftArrowFunctionKey:
+            case NSRightArrowFunctionKey:
+            case NSUpArrowFunctionKey:
+            case NSDownArrowFunctionKey:
+                
+            default:
+                if (uc <= 0x7f)
+                {
+                    char c = uc;
+                    if (flags & NSControlKeyMask)
+                        c = CTRL(c);
+                    
+                    output->write(c);
+                }
+                break;
+        }
+        
+        
+        
+    }
+}
+
 @end
diff --git a/iGeometry.cpp b/iGeometry.cpp
new file mode 100644
index 0000000..74e4a0d
--- /dev/null
+++ b/iGeometry.cpp
@@ -0,0 +1,28 @@
+/*
+ *  iGeometry.cpp
+ *  2Term
+ *
+ *  Created by Kelvin Sherlock on 7/10/2010.
+ *  Copyright 2010 __MyCompanyName__. All rights reserved.
+ *
+ */
+
+
+#include "iGeometry.h"
+
+
+bool iRect::contains(iPoint aPoint) const
+{
+    return aPoint.x >= origin.x
+    && aPoint.y >= origin.y
+    && aPoint.x <= origin.x + size.width
+    && aPoint.y <= origin.y + size.height;    
+}
+
+bool iRect::contains(iRect aRect) const
+{
+    return aRect.origin.x >= origin.x
+    && aRect.origin.y >= origin.y
+    && aRect.origin.x + aRect.size.width <= origin.x + size.width
+    && aRect.origin.y + aRect.size.height <= origin.y + size.height;
+}
\ No newline at end of file
diff --git a/iGeometry.h b/iGeometry.h
index 05966aa..9bc4c0f 100644
--- a/iGeometry.h
+++ b/iGeometry.h
@@ -47,6 +47,11 @@ typedef struct iRect {
     iRect() {}
     iRect(const iRect &aRect) : origin(aRect.origin), size(aRect.size) {}
     iRect(const iPoint &aPoint, const iSize &aSize) : origin(aPoint), size(aSize) {}
+    
+    bool contains(iPoint aPoint) const;
+    bool contains(iRect aRect) const;
+    
+    bool intersects(iRect aRect) const;
 #endif
     
 } iRect;
diff --git a/images/sl25.png b/images/sl25.png
deleted file mode 100644
index 9214fca..0000000
Binary files a/images/sl25.png and /dev/null differ
diff --git a/images/sl50.png b/images/sl50.png
deleted file mode 100644
index 1cc7b98..0000000
Binary files a/images/sl50.png and /dev/null differ
diff --git a/images/sl75.png b/images/sl75.png
deleted file mode 100644
index b88fa45..0000000
Binary files a/images/sl75.png and /dev/null differ