diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
index 5b5debb69..ad2b8a7e4 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
@@ -58,7 +58,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Soft/Master System/Alex Kidd in Miracle World (US).sms&quot;"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "&quot;/Users/thomasharte/Library/Mobile\ Documents/com\~apple\~CloudDocs/Soft/Archimedes/Lemmings.adf&quot;"
@@ -66,7 +66,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--new=zxspectrum"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--display=CompositeColour"
diff --git a/Outputs/OpenGL/ScanTarget.cpp b/Outputs/OpenGL/ScanTarget.cpp
index 40be79f42..b7dd6852c 100644
--- a/Outputs/OpenGL/ScanTarget.cpp
+++ b/Outputs/OpenGL/ScanTarget.cpp
@@ -418,6 +418,7 @@ void ScanTarget::update(const int output_width, const int output_height) {
 			GL_NEAREST,
 			false	// TODO: should probably be true, if I'm going to use stencil (?)
 		);
+//		fill_random(output_buffer_);
 	}
 
 	// Grab the new output list.
@@ -681,14 +682,15 @@ void ScanTarget::update(const int output_width, const int output_height) {
 			}
 
 			// Submit new lines.
-			lines_.bind_buffer();
+			lines_.bind_all();
 			size_t buffer_destination = 0;
 			const auto submit = [&](const size_t begin, const size_t end) {
+				const auto size = (end - begin) * sizeof(Line);
 				test_gl([&]{
 					glBufferSubData(
 						GL_ARRAY_BUFFER,
 						buffer_destination,
-						(end - begin) * sizeof(Line),
+						size,
 						&line_buffer_[begin]
 					);
 				});
diff --git a/Outputs/OpenGL/Shaders/LineOutputShader.cpp b/Outputs/OpenGL/Shaders/LineOutputShader.cpp
index 0ecc2c466..4efe45983 100644
--- a/Outputs/OpenGL/Shaders/LineOutputShader.cpp
+++ b/Outputs/OpenGL/Shaders/LineOutputShader.cpp
@@ -37,8 +37,8 @@ void main(void) {
 
 	coordinate = vec2(
 		mix(
-			lineEndpoint0CyclesSinceRetrace,
-			lineEndpoint1CyclesSinceRetrace,
+			0.0, //lineEndpoint0CyclesSinceRetrace,
+			sourceSize.x, //lineEndpoint1CyclesSinceRetrace,
 			lateral
 		),
 		lineLine + 0.5
@@ -50,12 +50,12 @@ void main(void) {
 	vec2 centre =
 		mix(
 			lineEndpoint0Position,
-			lineEndpoint1Position,
+			lineEndpoint1Position, 
 			lateral
 		) / positionScale;
 	gl_Position =
 		vec4(
-			centre + (longitudinal - 0.5) * normal,
+			centre + (longitudinal - 0.5) * normal * lineHeight,
 			0.0,
 			1.0
 		);
@@ -111,8 +111,8 @@ OpenGL::Shader OpenGL::line_output_shader(
 		);
 	};
 	enable("lineEndpoint0Position", line.end_points[0].x, 2);
-	enable("lineEndpoint0CyclesSinceRetrace", line.end_points[0].cycles_since_end_of_horizontal_retrace, 1);
 	enable("lineEndpoint1Position", line.end_points[1].x, 2);
+	enable("lineEndpoint0CyclesSinceRetrace", line.end_points[0].cycles_since_end_of_horizontal_retrace, 1);
 	enable("lineEndpoin10CyclesSinceRetrace", line.end_points[1].cycles_since_end_of_horizontal_retrace, 1);
 	enable("lineLine", line.line, 1);