diff --git a/__pycache__/config.cpython-35.pyc b/__pycache__/config.cpython-35.pyc
new file mode 100644
index 0000000..125b08f
Binary files /dev/null and b/__pycache__/config.cpython-35.pyc differ
diff --git a/__pycache__/ls_connection.cpython-35.pyc b/__pycache__/ls_connection.cpython-35.pyc
new file mode 100644
index 0000000..d122df6
Binary files /dev/null and b/__pycache__/ls_connection.cpython-35.pyc differ
diff --git a/__pycache__/note_reader.cpython-35.pyc b/__pycache__/note_reader.cpython-35.pyc
new file mode 100644
index 0000000..97d978a
Binary files /dev/null and b/__pycache__/note_reader.cpython-35.pyc differ
diff --git a/ls_connection.py b/ls_connection.py
index 06a3b31..5c99d51 100644
--- a/ls_connection.py
+++ b/ls_connection.py
@@ -11,7 +11,7 @@ def ls_connect(ls_socket, call_func, window):
 	"""Connects given socket to the livesplit server."""
 	con_thread = Thread(target=try_connection, args=(ls_socket, call_func, window))
 	con_thread.start()
-		
+	
 		
 def init_socket():
 	"""Returns a fresh socket"""
@@ -31,9 +31,9 @@ def try_connection(ls_socket, call_func, window):
 		
 	call_func(window)
 	
-def close_socket(socket):
+def close_socket(com_socket):
 	"""Closes given socket."""
-	socket.close()
+	com_socket.close()
 
 def check_connection(ls_socket):
 	"""
diff --git a/main_window.py b/main_window.py
index dc46ab6..7d67804 100644
--- a/main_window.py
+++ b/main_window.py
@@ -38,7 +38,7 @@ def update(window, com_socket, text1, text2):
 	"""
 	if not runtime_info["ls_connected"]:
 		#try connecting to ls
-		connection_ok = con.ls_connect(com_socket, server_found, window)
+		con.ls_connect(com_socket, server_found, window)
 	else:
 		#is_connected
 		if runtime_info["notes"]:
@@ -49,7 +49,7 @@ def update(window, com_socket, text1, text2):
 			
 			if isinstance(new_index, bool):
 				#Connection error
-				test_connection(com_socket)
+				com_socket = test_connection(com_socket, window, text1, text2)
 			else:
 				#index retrieved succesfully
 				if new_index == -1:
@@ -61,7 +61,12 @@ def update(window, com_socket, text1, text2):
 						set_title_notes(window, 0)
 				else:
 					#timer is running
-					runtime_info["timer_running"] = True
+					if not runtime_info["timer_running"]:
+						runtime_info["timer_running"] = True
+						
+						#special case to fix scrolling
+						if runtime_info["active_split"] == 0:
+							runtime_info["active_split"] = -1
 					
 					if not runtime_info["active_split"] == new_index:
 						#new split, need to update
@@ -77,35 +82,38 @@ def update(window, com_socket, text1, text2):
 						else:
 							#connection error
 							set_title_notes(window, new_index)
-							test_connection(com_socket)
+							com_socket = test_connection(com_socket, window, text1, text2)
 							
 						runtime_info["active_split"] = new_index
 
 		else:
 			#notes not yet loaded
-			if not con.check_connection(com_socket):
-				#connection lost
-				runtime_info["ls_connected"] = False
-				update_icon(False, window)
-				com_socket = con.init_socket()
-			
+			com_socket = test_connection(com_socket, window, text1, text2)
+				
 	
 	
 	#self looping
 	window.after(int(config.POLLING_TIME * 1000), update, window, com_socket, text1, text2)					
 	
 	
-def test_connection(com_socket):
+def test_connection(com_socket, window, text1, text2):
 	if con.check_connection(com_socket):
-		return True
+		return com_socket
 	else:
-		reset_connection(com_socket)
-		return False
+		return reset_connection(com_socket, window, text1, text2)
 
 
-def reset_connection(com_socket):
+def reset_connection(com_socket, window, text1, text2):
+	if runtime_info["timer_running"]:
+		runtime_info["timer_running"] = False
+		runtime_info["active_split"] = -1
+		
+		update_notes(window, text1, text2, -1)
+		set_title_notes(window, 0)
+	
 	runtime_info["ls_connected"] = False
-	com_socket = con.init_socket()
+	update_icon(False, window)
+	return con.init_socket()
 	
 
 def server_found(window):