diff --git a/cl_radar.lua b/cl_radar.lua
index 471a05a..690731c 100644
--- a/cl_radar.lua
+++ b/cl_radar.lua
@@ -197,7 +197,7 @@ function RADAR:SetSettingValue( setting, value )
 	if ( value ~= nil ) then 
 		self.vars.settings[setting] = value 
 
-		if ( value == "same" or value == "opp" ) then 
+		if ( setting == "same" or setting == "opp" ) then 
 			self:UpdateRayEndCoords()
 		end 
 	end 
@@ -479,7 +479,7 @@ end
 
 function RADAR:UpdateRayEndCoords()
 	for k, v in pairs( self.rayTraces ) do 
-		local endY = ( self:GetSettingValue( v.rayType ) * 0.2 ) * v.endVec.y
+		local endY = ( self:GetSettingValue( v.rayType ) * 0.2 ) * v.endVec.baseY
 		v.endVec.y = endY
 	end 	
 end 
@@ -818,6 +818,7 @@ RegisterNUICallback( "setAntennaMode", function( data )
 	else
 		RADAR:SetAntennaMode( data.value, tonumber( data.mode ), function()
 			SendNUIMessage( { _type = "antennaMode", ant = data.value, mode = tonumber( data.mode ) } )
+			SendNUIMessage( { _type = "audio", name = "beep" } )
 		end )
 	end 
 end )
@@ -828,6 +829,7 @@ RegisterNUICallback( "toggleAntenna", function( data )
 	else
 		RADAR:ToggleAntenna( data.value, function()
 			SendNUIMessage( { _type = "antennaXmit", ant = data.value, on = RADAR:IsAntennaTransmitting( data.value ) } )
+			SendNUIMessage( { _type = "audio", name = RADAR:IsAntennaTransmitting( data.value ) and "xmit_on" or "xmit_off" } )
 		end )
 	end 
 end )
diff --git a/nui/beep.ogg b/nui/beep.ogg
new file mode 100644
index 0000000..14f3b2f
Binary files /dev/null and b/nui/beep.ogg differ
diff --git a/nui/radar.js b/nui/radar.js
index 66d8cc5..fd20e84 100644
--- a/nui/radar.js
+++ b/nui/radar.js
@@ -11,6 +11,13 @@
 // Variables
 var resourceName; 
 
+const audioNames = 
+{
+    beep: "beep.ogg",
+    xmit_on: "xmit_on.ogg",
+    xmit_off: "xmit_off.ogg",
+}
+
 // Setup the main const element structure, this way we can easily access elements without having the mess
 // that was in the JS file for WraithRS
 const elements = 
@@ -299,6 +306,12 @@ function settingUpdate( ants, fast )
     }
 }
 
+function playAudio( name )
+{
+    let audio = new Audio( audioNames[name] );
+    audio.play();
+}
+
 // This function is used to send data back through to the LUA side 
 function sendData( name, data ) {
     $.post( "http://" + resourceName + "/" + name, JSON.stringify( data ), function( datab ) {
@@ -365,6 +378,9 @@ window.addEventListener( "message", function( event ) {
         case "settingUpdate":
             settingUpdate( item.antennaData, item.fast ); 
             break; 
+        case "audio":
+            playAudio( item.name ); 
+            break; 
         default:
             break;
     }
diff --git a/nui/xmit_off.ogg b/nui/xmit_off.ogg
new file mode 100644
index 0000000..2318b1b
Binary files /dev/null and b/nui/xmit_off.ogg differ
diff --git a/nui/xmit_on.ogg b/nui/xmit_on.ogg
new file mode 100644
index 0000000..847b356
Binary files /dev/null and b/nui/xmit_on.ogg differ