diff --git a/public/src/js/parsetja.js b/public/src/js/parsetja.js
index 8845838..f739578 100644
--- a/public/src/js/parsetja.js
+++ b/public/src/js/parsetja.js
@@ -125,7 +125,6 @@
 		var branchPreference = "m"
 		
 		var currentMeasure = []
-		var firstMeasure = true
 		var firstNote = true
 		var circles = []
 		var circleID = 0
@@ -143,19 +142,6 @@
 					originalMS: ms,
 					speed: speed
 				})
-				if(firstMeasure){
-					firstMeasure = false
-					var msPerMeasure = 60000 * measure / bpm
-					for(var measureMs = ms - msPerMeasure; measureMs > 0; measureMs -= msPerMeasure){
-						this.measures.push({
-							ms: measureMs,
-							originalMS: ms,
-							speed: speed
-						})
-					}
-				}
-			}else{
-				firstMeasure = false
 			}
 			if(currentMeasure.length){
 				for(var i = 0; i < currentMeasure.length; i++){
diff --git a/public/src/js/songselect.js b/public/src/js/songselect.js
index f0dc2b6..e5da1a1 100644
--- a/public/src/js/songselect.js
+++ b/public/src/js/songselect.js
@@ -243,8 +243,8 @@ class SongSelect{
 		this.startP2()
 		
 		pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this))
-		pageEvents.add(window, "mousemove", this.mouseMove.bind(this))
-		pageEvents.add(window, ["mousedown", "touchstart"], this.mouseDown.bind(this))
+		pageEvents.add(loader.screen, "mousemove", this.mouseMove.bind(this))
+		pageEvents.add(loader.screen, ["mousedown", "touchstart"], this.mouseDown.bind(this))
 		if(touchEnabled && fullScreenSupported){
 			this.touchFullBtn = document.getElementById("touch-full-btn")
 			this.touchFullBtn.style.display = "block"
@@ -1459,7 +1459,7 @@ class SongSelect{
 		this.redrawRunning = false
 		this.endPreview()
 		pageEvents.keyRemove(this, "all")
-		pageEvents.remove(window, ["mousemove", "mousedown", "touchstart"])
+		pageEvents.remove(loader.screen, ["mousemove", "mousedown", "touchstart"])
 		if(this.touchEnabled && fullScreenSupported){
 			pageEvents.remove(this.touchFullBtn, "click")
 			delete this.touchFullBtn