diff --git a/ASUSWmi.cs b/ASUSWmi.cs
index e2f09859..efc487ea 100644
--- a/ASUSWmi.cs
+++ b/ASUSWmi.cs
@@ -25,12 +25,12 @@ public class ASUSWmi
     public const uint DevsCPUFanCurve = 0x00110024;
     public const uint DevsGPUFanCurve = 0x00110025;
 
-    public const int PPT_Total = 0x001200A0;
-    public const int PPT_Total1 = 0x001200A1;
-    public const int PPT_Total2 = 0x001200A2;
+    public const int PPT_TotalA0 = 0x001200A0;
+    public const int PPT_TotalA1 = 0x001200A1;
 
-    public const int PPT_CPU = 0x001200B0;
-    public const int PPT_CPU1 = 0x001200B1;
+    public const int PPT_CPUB0 = 0x001200B0;
+    public const int PPT_CPUB1 = 0x001200B1;
+    public const int PPT_CPUA2 = 0x001200A2;
 
     public const int PerformanceBalanced = 0;
     public const int PerformanceTurbo = 1;
diff --git a/Fans.cs b/Fans.cs
index f41536f2..d8757296 100644
--- a/Fans.cs
+++ b/Fans.cs
@@ -141,12 +141,11 @@ namespace GHelper
             Program.config.setConfig("limit_total", limit_total);
             Program.config.setConfig("limit_cpu", limit_cpu);
 
-            Program.wmi.DeviceSet(ASUSWmi.PPT_Total, limit_total);
-            Program.wmi.DeviceSet(ASUSWmi.PPT_Total1, limit_total);
-            Program.wmi.DeviceSet(ASUSWmi.PPT_Total2, limit_total);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA0, limit_total);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA1, limit_total);
 
-            Program.wmi.DeviceSet(ASUSWmi.PPT_CPU, limit_cpu);
-            //Program.wmi.DeviceSet(ASUSWmi.PPT_CPU1, limit_cpu);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_CPUB0, limit_cpu);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_CPUA2, limit_cpu);
 
             labelApplied.ForeColor = Color.Blue;
             labelApplied.Text = "Applied";
diff --git a/Settings.cs b/Settings.cs
index 08c06e94..6ab3a5f7 100644
--- a/Settings.cs
+++ b/Settings.cs
@@ -749,18 +749,12 @@ namespace GHelper
         public void SetBatteryChargeLimit(int limit = 100)
         {
 
-            if (limit < 50 || limit > 100) limit = 100;
+            if (limit < 40 || limit > 100) return;
 
             labelBatteryTitle.Text = "Battery Charge Limit: " + limit.ToString() + "%";
             trackBattery.Value = limit;
-            try
-            {
-                Program.wmi.DeviceSet(ASUSWmi.BatteryLimit, limit);
-            }
-            catch
-            {
-                Debug.WriteLine("Can't set battery charge limit");
-            }
+            Program.wmi.DeviceSet(ASUSWmi.BatteryLimit, limit);
+
             Program.config.setConfig("charge_limit", limit);
 
         }