diff --git a/Assets/Materials/uncategorized/WaveformDisplaymat.mat b/Assets/Materials/uncategorized/WaveformDisplaymat.mat
index b7d516ed5..53a3e1a73 100644
--- a/Assets/Materials/uncategorized/WaveformDisplaymat.mat
+++ b/Assets/Materials/uncategorized/WaveformDisplaymat.mat
@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: WaveformDisplayMat
+  m_Name: WaveformDisplaymat
   m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1
diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset
index ce0beca3d..cf5cd6c59 100644
--- a/Assets/Resources/OVRBuildConfig.asset
+++ b/Assets/Resources/OVRBuildConfig.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3}
   m_Name: OVRBuildConfig
   m_EditorClassIdentifier: 
-  androidSDKPath: C:\Program Files\Unity\Hub\Editor\2019.3.0f6\Editor\Data\PlaybackEngines\AndroidPlayer\SDK
+  androidSDKPath: 
   gradlePath: 
   jdkPath: 
diff --git a/Assets/Scripts/masterControl.cs b/Assets/Scripts/masterControl.cs
index fad18111f..03b8abaec 100644
--- a/Assets/Scripts/masterControl.cs
+++ b/Assets/Scripts/masterControl.cs
@@ -71,21 +71,24 @@ void Awake() {
     _sampleDuration = 1.0 / AudioSettings.outputSampleRate;
 
     var configuration = AudioSettings.GetConfiguration();
-    if(configuration.sampleRate == 48000){
+    if (configuration.sampleRate == 48000)
+    {
       Debug.Log("Unity sample rate is " + configuration.sampleRate);
-    } else {
+    }
+    else
+    {
       Debug.LogWarning("Unity sample rate is " + configuration.sampleRate);
     }
 
     if (Application.platform == RuntimePlatform.Android)
     {
-      Debug.Log("Buffer size was: " + AudioSettings.GetConfiguration().dspBufferSize);
-      configuration = AudioSettings.GetConfiguration();
-      configuration.dspBufferSize = 256;
-      AudioSettings.Reset(configuration);
+      Debug.Log("Buffer size is: " + AudioSettings.GetConfiguration().dspBufferSize);
+      //configuration = AudioSettings.GetConfiguration();
+      //configuration.dspBufferSize = 256;
+      //AudioSettings.Reset(configuration);
 
-      configuration = AudioSettings.GetConfiguration();
-      Debug.Log("Buffer size is now set to: " + AudioSettings.GetConfiguration().dspBufferSize);
+      //configuration = AudioSettings.GetConfiguration();
+      //Debug.Log("Buffer size is now set to: " + AudioSettings.GetConfiguration().dspBufferSize);
 
       //OVRPlugin.systemDisplayFrequency = 72;
       Debug.Log("Current cpuLevel: " + OVRManager.cpuLevel + ", gpuLevel: " + OVRManager.gpuLevel);
@@ -95,7 +98,7 @@ void Awake() {
       Debug.Log("New cpuLevel: " + OVRManager.cpuLevel + ", gpuLevel: " + OVRManager.gpuLevel);
     }
 
-    AudioSettings.Reset(configuration);
+    //AudioSettings.Reset(configuration); // DO NOT RE-ENABLE THIS, this fried the OnAudioFilterRead hook on the mastercontrol clock
 
     if (!PlayerPrefs.HasKey("glowVal")) PlayerPrefs.SetFloat("glowVal", 1);
     if (!PlayerPrefs.HasKey("envSound")) PlayerPrefs.SetInt("envSound", 1);
diff --git a/Assets/main.meta b/Assets/main.meta
index 756dd17ed..3aef27e7c 100644
--- a/Assets/main.meta
+++ b/Assets/main.meta
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD:Assets/SoundStageNative/SoundStageNative.meta
-guid: 44fd596e54ad19e499d1a0e460421d17
-=======
-guid: 510aff503a527e44d8eff69fb78d8b47
->>>>>>> gfx-tunings:Assets/main.meta
+guid: 80d58723512bd0c4ca1cba6278b961f6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/main.unity b/Assets/main.unity
index a4310057d..2ee651cfb 100644
--- a/Assets/main.unity
+++ b/Assets/main.unity
@@ -98,7 +98,7 @@ LightmapSettings:
     m_ExportTrainingData: 0
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 112000000, guid: 060ddb2e2647f174ebb97b32d18bf2d8,
+  m_LightingDataAsset: {fileID: 112000000, guid: fc7701f2f9092834ab8759d3f18863dc,
     type: 2}
   m_UseShadowmask: 0
 --- !u!196 &4
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 08dfa985f..c17c4ee44 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -119,7 +119,8 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.25
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 8207365043489784020, guid: 93c4f4428c8e3814dbf9d469c39e85d4, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1