diff --git a/audio/comet/aidl_config/audio_policy_volumes.xml b/audio/comet/aidl_config/audio_policy_volumes.xml
index 046a3a1..e5fcd20 100644
--- a/audio/comet/aidl_config/audio_policy_volumes.xml
+++ b/audio/comet/aidl_config/audio_policy_volumes.xml
@@ -52,7 +52,7 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4000</point>
+        <point>1,-3700</point>
         <point>71,-1800</point>
         <point>100,-1000</point>
     </volume>
@@ -78,10 +78,10 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5750</point>
-        <point>32,-3200</point>
-        <point>60,-1700</point>
-        <point>80,-1000</point>
+        <point>1,-6000</point>
+        <point>12,-4750</point>
+        <point>32,-3100</point>
+        <point>80,-900</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -93,8 +93,9 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-3500</point>
-        <point>1,-3000</point>
+        <point>0,-4500</point>
+        <point>28,-2600</point>
+        <point>42,-1400</point>
         <point>71,-600</point>
         <point>100,0</point>
     </volume>
@@ -107,8 +108,8 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-3300</point>
-        <point>57,-1700</point>
+        <point>1,-3650</point>
+        <point>57,-1600</point>
         <point>71,-1100</point>
         <point>100,0</point>
     </volume>
@@ -147,8 +148,9 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4960</point>
-        <point>100,0</point>
+        <point>1,-3700</point>
+        <point>71,-1800</point>
+        <point>100,-1000</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -163,9 +165,9 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4900</point>
+        <point>1,-5700</point>
         <point>57,-2200</point>
-        <point>100,-550</point>
+        <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/comet/tuning/waves/waves_preset.mps b/audio/comet/tuning/waves/waves_preset.mps
index 7019f65..397226d 100644
Binary files a/audio/comet/tuning/waves/waves_preset.mps and b/audio/comet/tuning/waves/waves_preset.mps differ
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index a66f326..0d08f6a 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -23,6 +23,7 @@ ChipCfg_VDR_low_end_Time = 20
 Chip_Configuration_AidingConfiguration=0x00020046
 Chip_Configuration_RefClkControl=0x24
 Chip_Configuration_DCXO_CrystalType=0x11
+Chip_Configuration_FeatureCfg_MTPL = 0
 Chip_Configuration_GNSSConstConstraintDef = 0x60BF
 LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
@@ -42,7 +43,7 @@ SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
 SETCaps_SuplUT1=20
 PosReq_Supl2Params_SuplNiUdpPort=7275
-GlueLayer_LPPCpBitmask=0x17
+GlueLayer_LPPCpBitmask=0xFF
 GlueLayer_IsCpLteNeighborCellEnable=1
 GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index accf419..647eae6 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -92,6 +92,9 @@ Chip_Configuration_DCXO_CrystalType=0x11
 #    Range should be 2000 to 3100
 #Chip_Configuration_DCXO_InflectionPoint=2855
 
+# Disable MTPL
+Chip_Configuration_FeatureCfg_MTPL = 0
+
 # L1 + L5 MCW
 Chip_Configuration_GNSSConstConstraintDef = 0x60BF
 LocTech_Constraints = 0x60BF
@@ -166,7 +169,7 @@ SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
 SETCaps_SuplUT1=20
 PosReq_Supl2Params_SuplNiUdpPort=7275
-GlueLayer_LPPCpBitmask=0x17
+GlueLayer_LPPCpBitmask=0xFF
 GlueLayer_IsCpLteNeighborCellEnable=1
 GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 74e136e..3a6e767 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -646,6 +646,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
         "50",
+        "32",
         "30",
         "20",
         "18"
@@ -1908,7 +1909,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "35"
+      "Value": "55"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1926,7 +1927,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "20"
+      "Value": "32"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",