diff --git a/lib/game_clock/net/packet_handler.rb b/lib/game_clock/net/packet_handler.rb
index 1f3e628..6bf13ed 100644
--- a/lib/game_clock/net/packet_handler.rb
+++ b/lib/game_clock/net/packet_handler.rb
@@ -103,7 +103,7 @@ module TAC
 
     def handle_get_clock_title(packet)
       unless @host_is_a_connection
-        $RemoteControl.server.active_client.puts(Packet.clock_title(@proxy_object.clock.title))
+        RemoteControl.server.active_client.puts(Packet.clock_title(@proxy_object.clock.title))
       end
     end
 
@@ -111,7 +111,7 @@ module TAC
       unless @host_is_a_connection
         @proxy_object.jukebox_previous_track
 
-        $RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
+        RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
       end
     end
 
@@ -119,7 +119,7 @@ module TAC
       unless @host_is_a_connection
         @proxy_object.jukebox_next_track
 
-        $RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
+        RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
       end
     end
 
@@ -127,7 +127,7 @@ module TAC
       unless @host_is_a_connection
         @proxy_object.jukebox_play
 
-        $RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
+        RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
       end
     end
 
@@ -135,7 +135,7 @@ module TAC
       unless @host_is_a_connection
         @proxy_object.jukebox_pause
 
-        $RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
+        RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
       end
     end
 
@@ -143,7 +143,7 @@ module TAC
       unless @host_is_a_connection
         @proxy_object.jukebox_stop
 
-        $RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
+        RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_current_track(@proxy_object.jukebox_current_track))
       end
     end
 
@@ -155,7 +155,7 @@ module TAC
         @proxy_object.jukebox_set_volume(float)
 
         float = @proxy_object.jukebox_volume
-        $RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_volume(float))
+        RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_volume(float))
       end
     end
 
@@ -163,7 +163,7 @@ module TAC
       unless @host_is_a_connection
         float = @proxy_object.jukebox_volume
 
-        $RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_volume(float))
+        RemoteControl.server.active_client.puts(PacketHandler.packet_jukebox_volume(float))
       end
     end
 
@@ -202,13 +202,13 @@ module TAC
 
       unless @host_is_a_connection
         # Send confirmation to client
-        $RemoteControl.server.active_client.puts(PacketHandler.packet_randomizer_visible(boolean))
+        RemoteControl.server.active_client.puts(PacketHandler.packet_randomizer_visible(boolean))
       end
     end
 
     def handle_shutdown(packet)
       unless @host_is_a_connection
-        # $RemoteControl.server.close
+        # RemoteControl.server.close
         # $window.close
         Gosu::Song.current_song&.stop
         exit
diff --git a/lib/game_clock/remote_control.rb b/lib/game_clock/remote_control.rb
index 9e57f2b..378be2f 100644
--- a/lib/game_clock/remote_control.rb
+++ b/lib/game_clock/remote_control.rb
@@ -112,7 +112,7 @@ module TAC
                 start_clock(:endgame_only)
               end
 
-              button "Abort Clock", width: 1.0 do
+              button "Abort Match", width: 1.0 do
                 RemoteControl.connection.puts(ClockNet::PacketHandler.packet_abort_clock)
               end
 
@@ -260,6 +260,7 @@ module TAC
         end
 
         def randomizer_changed(boolean)
+          puts "Randomizer is visable? #{boolean}"
           @randomizer_label.value = "Visible" if boolean
           @randomizer_label.value = "Not Visible" unless boolean
         end
diff --git a/lib/game_clock/view.rb b/lib/game_clock/view.rb
index a380314..9cf28de 100644
--- a/lib/game_clock/view.rb
+++ b/lib/game_clock/view.rb
@@ -51,7 +51,7 @@ module TAC
               @clock_proxy.start_clock(:endgame_only)
             end
 
-            button "Abort Clock", width: 1.0, margin_top: 50 do
+            button "Abort Match", width: 1.0, margin_top: 50 do
               @clock_proxy.abort_clock
             end