diff --git a/nomanssave/AccountPanel.java b/nomanssave/AccountPanel.java
index 9978151..068e2d0 100644
--- a/nomanssave/AccountPanel.java
+++ b/nomanssave/AccountPanel.java
@@ -59,7 +59,7 @@ public class AccountPanel extends JPanel {
       this.add(var10);
    }
 
-   void AboutDialog(JsonObject var1) {
+   void loadAccountData(JsonObject var1) {
       if (var1 == null) {
          this.accountTable.AboutDialog((JsonArray)null);
          this.d.AboutDialog((JsonArray)null);
diff --git a/nomanssave/AlienWord.java b/nomanssave/AlienWord.java
index f6411fe..e88168a 100644
--- a/nomanssave/AlienWord.java
+++ b/nomanssave/AlienWord.java
@@ -77,7 +77,7 @@ public Race ShowErrorRunnable(String var1) {
       return (Race)this.kp.get(var1);
    }
 
-   public boolean AboutDialog(Race var1) {
+   public boolean isSpokenBy(Race var1) {
       return this.kp.containsValue(var1);
    }
 
diff --git a/nomanssave/AppSettings.java b/nomanssave/AppSettings.java
index b69d47d..07e22c1 100644
--- a/nomanssave/AppSettings.java
+++ b/nomanssave/AppSettings.java
@@ -57,25 +57,25 @@ public static int j(String var0) {
       return cK.J(var0);
    }
 
-   public static int AboutDialog(String var0, int var1) {
+   public static int getInt(String var0, int var1) {
       return cK.AccountPanel(var0, var1);
    }
 
-   public static void AboutDialogCloseListener(String var0, int var1) {
+   public static void setInt(String var0, int var1) {
       cK.AccountPanel(var0, var1);
       cL = true;
    }
 
-   public static double AboutDialog(String var0, double var1) {
+   public static double getDouble(String var0, double var1) {
       return cK.AccountPanel(var0, var1);
    }
 
-   public static void AboutDialogCloseListener(String var0, double var1) {
+   public static void setDouble(String var0, double var1) {
       cK.AccountPanel(var0, var1);
       cL = true;
    }
 
-   public static Object[] AboutDialog(String var0, Class var1) {
+   public static Object[] getArray(String var0, Class var1) {
       JsonArray var2 = cK.d(var0);
       if (var2 == null) {
          return (Object[])Array.newInstance(var1, 0);
@@ -90,7 +90,7 @@ public static Object[] AboutDialog(String var0, Class var1) {
       }
    }
 
-   public static void AboutDialog(String var0, Object[] var1) {
+   public static void setArray(String var0, Object[] var1) {
       JsonArray var2 = new JsonArray();
 
       for(int var3 = 0; var3 < var1.length; ++var3) {
@@ -208,9 +208,9 @@ public static void init(boolean var0) {
                      String var9 = var3.getProperty(var7);
                      if (!var7.equals("InventoryFontScale")) {
                         if (var7.equals("InventoryScaling")) {
-                           cK.AboutDialogCloseListener("InventoryScaling", (Object)Double.parseDouble(var9));
+                           cK.setValueByPath("InventoryScaling", (Object)Double.parseDouble(var9));
                         } else if (var7.equals("FontScaling")) {
-                           cK.AboutDialogCloseListener("FontScaling", (Object)Double.parseDouble(var9));
+                           cK.setValueByPath("FontScaling", (Object)Double.parseDouble(var9));
                         } else {
                            int var5;
                            int var10;
@@ -248,7 +248,7 @@ public static void init(boolean var0) {
                }
 
                if (var6.size() > 0) {
-                  cK.AboutDialogCloseListener("SteamIDs", (Object)var6);
+                  cK.setValueByPath("SteamIDs", (Object)var6);
                }
 
                cL = true;
@@ -315,7 +315,7 @@ public static void V() {
          double var4 = cK.L("InventoryScaling");
          if (var4 <= 0.0D) {
             var4 = 1.0D;
-            cK.AboutDialogCloseListener("InventoryScaling", (Object)var4);
+            cK.setValueByPath("InventoryScaling", (Object)var4);
             cL = true;
          }
 
diff --git a/nomanssave/Application.java b/nomanssave/Application.java
index 160826a..6955fff 100644
--- a/nomanssave/Application.java
+++ b/nomanssave/Application.java
@@ -124,7 +124,7 @@ public static String formatDateShort(long var0) {
       return var2.format(new Date(var0));
    }
 
-   private static String AboutDialog(String var0, String var1) {
+   private static String sanitizeFileName(String var0, String var1) {
       if (var0 == null) {
          return var1;
       } else {
@@ -313,11 +313,11 @@ private Application(boolean var1) {
             int var4 = this.currentSave.J("PlayerStateData.ActiveMultioolIndex");
             if (var1x.startsWith("PlayerStateData.Multitools[" + var4 + "].Store.")) {
                JsonObject var5 = this.currentSave.H("PlayerStateData.Multitools[" + var4 + "].Store");
-               this.currentSave.AboutDialogCloseListener("PlayerStateData.WeaponInventory", (Object)var5.MilestonesPanel());
+               this.currentSave.setValueByPath("PlayerStateData.WeaponInventory", (Object)var5.MilestonesPanel());
             } else if (var1x.equals("PlayerStateData.Multitools[" + var4 + "].Seed[1]")) {
-               this.currentSave.AboutDialogCloseListener("PlayerStateData.CurrentWeapon.GenerationSeed[1]", var3x);
+               this.currentSave.setValueByPath("PlayerStateData.CurrentWeapon.GenerationSeed[1]", var3x);
             } else if (var1x.equals("PlayerStateData.Multitools[" + var4 + "].Resource.Filename")) {
-               this.currentSave.AboutDialogCloseListener("PlayerStateData.CurrentWeapon.Filename", var3x);
+               this.currentSave.setValueByPath("PlayerStateData.CurrentWeapon.Filename", var3x);
             }
          }
 
@@ -370,7 +370,7 @@ private Application(boolean var1) {
                this.accountJson.AboutDialog(this.accountChangeListener);
             }
          } catch (IOException var5) {
-            Logger.AboutDialog("Error reading account data", var5);
+            Logger.error("Error reading account data", var5);
          }
       }
 
@@ -382,14 +382,14 @@ public JFrame getMainWindow() {
       return this.mainWindow;
    }
 
-   public void AboutDialog(Starship var1) {
+   public void exportStarship(Starship var1) {
       File var2 = nomanssave.AppSettings.cF;
       if (!var2.exists() && !var2.mkdir()) {
          var2 = nomanssave.AppSettings.cD;
       }
 
       cT var3 = cT.discoveryPanel();
-      String var4 = AboutDialog(var1.getName(), "Ship");
+      String var4 = sanitizeFileName(var1.getName(), "Ship");
       var3.setCurrentDirectory(var2);
       var3.setSelectedFile(new File(var2, var4));
       if (var3.showSaveDialog(this.mainWindow) == 0) {
@@ -401,24 +401,24 @@ public void AboutDialog(Starship var1) {
 
             var1.AboutDialog(var5, var3.freighterPanel());
          } catch (RuntimeException var6) {
-            Logger.AboutDialog("Ship export error", var6);
-            this.AccountPanel("An error occured during export.");
+            Logger.error("Ship export error", var6);
+            this.showWarning("An error occured during export.");
          } catch (IOException var7) {
-            Logger.AboutDialog("Ship export error", var7);
-            this.AccountPanel("An error occured during export.");
+            Logger.error("Ship export error", var7);
+            this.showWarning("An error occured during export.");
          }
       }
 
    }
 
-   public void AboutDialog(Multitool var1) {
+   public void exportMultitool(Multitool var1) {
       File var2 = nomanssave.AppSettings.cF;
       if (!var2.exists() && !var2.mkdir()) {
          var2 = nomanssave.AppSettings.cD;
       }
 
       cv var3 = cv.frigatesPanel();
-      String var4 = AboutDialog(var1.getName(), "Weapon");
+      String var4 = sanitizeFileName(var1.getName(), "Weapon");
       var3.setCurrentDirectory(var2);
       var3.setSelectedFile(new File(var2, var4));
       if (var3.showSaveDialog(this.mainWindow) == 0) {
@@ -430,17 +430,17 @@ public void AboutDialog(Multitool var1) {
 
             var1.isFrigateOnMission(var5);
          } catch (RuntimeException var6) {
-            Logger.AboutDialog("Weapon export error", var6);
-            this.AccountPanel("An error occured during export.");
+            Logger.error("Weapon export error", var6);
+            this.showWarning("An error occured during export.");
          } catch (IOException var7) {
-            Logger.AboutDialog("Weapon export error", var7);
-            this.AccountPanel("An error occured during export.");
+            Logger.error("Weapon export error", var7);
+            this.showWarning("An error occured during export.");
          }
       }
 
    }
 
-   public void AboutDialog(Companion var1) {
+   public void exportCompanion(Companion var1) {
       File var2 = nomanssave.AppSettings.cF;
       if (!var2.exists() && !var2.mkdir()) {
          var2 = nomanssave.AppSettings.cD;
@@ -448,7 +448,7 @@ public void AboutDialog(Companion var1) {
 
       String var3 = "." + var1.cL().name().toLowerCase();
       cp var4 = cp.multitoolPanel();
-      String var5 = AboutDialog(var1.getName(), var1.cL().name());
+      String var5 = sanitizeFileName(var1.getName(), var1.cL().name());
       var4.setCurrentDirectory(var2);
       var4.setSelectedFile(new File(var2, var5));
       if (var4.showSaveDialog(this.mainWindow) == 0) {
@@ -460,11 +460,11 @@ public void AboutDialog(Companion var1) {
 
             var1.isFrigateOnMission(var6);
          } catch (RuntimeException var7) {
-            Logger.AboutDialog("Companion export error", var7);
-            this.AccountPanel("An error occured during export.");
+            Logger.error("Companion export error", var7);
+            this.showWarning("An error occured during export.");
          } catch (IOException var8) {
-            Logger.AboutDialog("Companion export error", var8);
-            this.AccountPanel("An error occured during export.");
+            Logger.error("Companion export error", var8);
+            this.showWarning("An error occured during export.");
          }
       }
 
@@ -483,11 +483,11 @@ public Starship deleteMultitool() {
                this.saveModified = true;
                return var5;
             } catch (RuntimeException var6) {
-               Logger.AboutDialog("Ship import error", var6);
-               this.AccountPanel("An error occured during import.");
+               Logger.error("Ship import error", var6);
+               this.showWarning("An error occured during import.");
             } catch (IOException var7) {
-               Logger.AboutDialog("Ship import error", var7);
-               this.AccountPanel("An error occured during import.");
+               Logger.error("Ship import error", var7);
+               this.showWarning("An error occured during import.");
             }
          }
 
@@ -510,11 +510,11 @@ public Multitool deleteShip() {
                this.saveModified = true;
                return var5;
             } catch (RuntimeException var6) {
-               Logger.AboutDialog("Weapon import error", var6);
-               this.AccountPanel("An error occured during import.");
+               Logger.error("Weapon import error", var6);
+               this.showWarning("An error occured during import.");
             } catch (IOException var7) {
-               Logger.AboutDialog("Weapon import error", var7);
-               this.AccountPanel("An error occured during import.");
+               Logger.error("Weapon import error", var7);
+               this.showWarning("An error occured during import.");
             }
          }
 
@@ -537,11 +537,11 @@ public Companion isFrigateOnMission() {
                this.saveModified = true;
                return var5;
             } catch (RuntimeException var6) {
-               Logger.AboutDialog("Companion import error", var6);
-               this.AccountPanel("An error occured during import.");
+               Logger.error("Companion import error", var6);
+               this.showWarning("An error occured during import.");
             } catch (IOException var7) {
-               Logger.AboutDialog("Companion import error", var7);
-               this.AccountPanel("An error occured during import.");
+               Logger.error("Companion import error", var7);
+               this.showWarning("An error occured during import.");
             }
          }
 
@@ -551,14 +551,14 @@ public Companion isFrigateOnMission() {
       }
    }
 
-   public void AboutDialog(Base var1) {
+   public void backupBase(Base var1) {
       File var2 = nomanssave.AppSettings.cE;
       if (!var2.exists() && !var2.mkdir()) {
          var2 = nomanssave.AppSettings.cD;
       }
 
       cl var3 = cl.ar();
-      String var4 = AboutDialog(var1.getName(), "Base");
+      String var4 = sanitizeFileName(var1.getName(), "Base");
       var3.setCurrentDirectory(var2);
       var3.setSelectedFile(new File(var2, var4));
       if (var3.showSaveDialog(this.mainWindow) == 0) {
@@ -574,20 +574,20 @@ public void AboutDialog(Base var1) {
 
             BackupUtil.d(var1.cH(), var5);
          } catch (RuntimeException var6) {
-            Logger.AboutDialog("Base backup error", var6);
-            this.AccountPanel("An error occured during backup.");
+            Logger.error("Base backup error", var6);
+            this.showWarning("An error occured during backup.");
          } catch (IOException var7) {
-            Logger.AboutDialog("Base backup error", var7);
-            this.AccountPanel("An error occured during backup.");
+            Logger.error("Base backup error", var7);
+            this.showWarning("An error occured during backup.");
          } catch (GeneralSecurityException var8) {
-            Logger.AboutDialog("Base backup error", var8);
-            this.AccountPanel("An error occured during backup.");
+            Logger.error("Base backup error", var8);
+            this.showWarning("An error occured during backup.");
          }
       }
 
    }
 
-   public boolean AboutDialogCloseListener(Base var1) {
+   public boolean restoreBase(Base var1) {
       File var2 = nomanssave.AppSettings.cE.exists() ? nomanssave.AppSettings.cE : nomanssave.AppSettings.cD;
       cl var3 = cl.ar();
       var3.setCurrentDirectory(var2);
@@ -602,18 +602,18 @@ public boolean AboutDialogCloseListener(Base var1) {
             this.saveModified = true;
             return true;
          } catch (IOException var5) {
-            Logger.AboutDialog("Base restore error", var5);
-            this.AccountPanel("An error occured during backup.");
+            Logger.error("Base restore error", var5);
+            this.showWarning("An error occured during backup.");
          } catch (GeneralSecurityException var6) {
-            Logger.AboutDialog("Base restore error", var6);
-            this.AccountPanel("An error occured during backup.");
+            Logger.error("Base restore error", var6);
+            this.showWarning("An error occured during backup.");
          }
       }
 
       return false;
    }
 
-   public void AboutDialog(Freighter var1) {
+   public void backupFreighter(Freighter var1) {
       FreighterBase var2 = var1.cZ();
       if (var2 != null) {
          File var3 = nomanssave.AppSettings.cE;
@@ -622,7 +622,7 @@ public void AboutDialog(Freighter var1) {
          }
 
          cs var4 = cs.squadronPanel();
-         String var5 = AboutDialog(var2.getName(), "Freighter");
+         String var5 = sanitizeFileName(var2.getName(), "Freighter");
          var4.setCurrentDirectory(var3);
          var4.setSelectedFile(new File(var3, var5));
          if (var4.showSaveDialog(this.mainWindow) == 0) {
@@ -675,21 +675,21 @@ public void AboutDialog(Freighter var1) {
                var7.put("InventoryCargo", var11);
                BackupUtil.AboutDialog(var2.cH(), (Map)var7, (File)var6);
             } catch (RuntimeException var15) {
-               Logger.AboutDialog("Freighter backup error", var15);
-               this.AccountPanel("An error occured during backup.");
+               Logger.error("Freighter backup error", var15);
+               this.showWarning("An error occured during backup.");
             } catch (IOException var16) {
-               Logger.AboutDialog("Freighter backup error", var16);
-               this.AccountPanel("An error occured during backup.");
+               Logger.error("Freighter backup error", var16);
+               this.showWarning("An error occured during backup.");
             } catch (GeneralSecurityException var17) {
-               Logger.AboutDialog("Freighter backup error", var17);
-               this.AccountPanel("An error occured during backup.");
+               Logger.error("Freighter backup error", var17);
+               this.showWarning("An error occured during backup.");
             }
          }
 
       }
    }
 
-   public boolean AboutDialogCloseListener(Freighter var1) {
+   public boolean restoreFreighter(Freighter var1) {
       FreighterBase var2 = var1.cZ();
       if (var2 == null) {
          return false;
@@ -745,17 +745,17 @@ public boolean AboutDialogCloseListener(Freighter var1) {
                   }
 
                   if (((String)var9.getKey()).equals("Inventory")) {
-                     var7.AboutDialogCloseListener("FreighterInventory", (Object)((JsonObject)var9.getValue()));
+                     var7.setValueByPath("FreighterInventory", (Object)((JsonObject)var9.getValue()));
                      var8 = true;
                   }
 
                   if (((String)var9.getKey()).equals("InventoryTech")) {
-                     var7.AboutDialogCloseListener("FreighterInventory_TechOnly", (Object)((JsonObject)var9.getValue()));
+                     var7.setValueByPath("FreighterInventory_TechOnly", (Object)((JsonObject)var9.getValue()));
                      var8 = true;
                   }
 
                   if (((String)var9.getKey()).equals("InventoryCargo")) {
-                     var7.AboutDialogCloseListener("FreighterInventory_Cargo", (Object)((JsonObject)var9.getValue()));
+                     var7.setValueByPath("FreighterInventory_Cargo", (Object)((JsonObject)var9.getValue()));
                      var8 = true;
                   }
                }
@@ -768,11 +768,11 @@ public boolean AboutDialogCloseListener(Freighter var1) {
                this.saveModified = true;
                return true;
             } catch (IOException var11) {
-               Logger.AboutDialog("Freighter restore error", var11);
-               this.AccountPanel("An error occured during restore.");
+               Logger.error("Freighter restore error", var11);
+               this.showWarning("An error occured during restore.");
             } catch (GeneralSecurityException var12) {
-               Logger.AboutDialog("Freighter restore error", var12);
-               this.AccountPanel("An error occured during restore.");
+               Logger.error("Freighter restore error", var12);
+               this.showWarning("An error occured during restore.");
             }
          }
 
@@ -781,7 +781,7 @@ public boolean AboutDialogCloseListener(Freighter var1) {
    }
 
    private void openFile() {
-      File var1 = ej.AboutDialogCloseListener(this.saveLocation == null ? null : this.saveLocation.InventorySlotPanel());
+      File var1 = ej.createFileChooser(this.saveLocation == null ? null : this.saveLocation.InventorySlotPanel());
       if (var1 != null) {
          String var2;
          File var3;
@@ -864,7 +864,7 @@ private void openFile() {
                   this.accountJson.AboutDialog(this.accountChangeListener);
                }
             } catch (IOException var7) {
-               Logger.AboutDialog("Error reading account data", var7);
+               Logger.error("Error reading account data", var7);
             }
 
             this.editAccountJsonMenuItem.setEnabled(this.accountJson != null);
@@ -878,7 +878,7 @@ private void openFile() {
          this.slotComboBox.setEnabled(true);
          this.fileComboBox.setEnabled(true);
          if (this.ExosuitPanel > 0) {
-            this.AccountPanel("The save file you have selected is not the most recent.");
+            this.showWarning("The save file you have selected is not the most recent.");
          }
 
          this.loadSave();
@@ -908,7 +908,7 @@ public void showError(String var1) {
       EventQueue.invokeLater(new ShowErrorRunnable(this, var1));
    }
 
-   public void AccountPanel(String var1) {
+   public void showWarning(String var1) {
       EventQueue.invokeLater(new ShowWarningRunnable(this, var1));
    }
 
@@ -989,7 +989,7 @@ private void loadSave() {
          this.tabbedPane.setEnabledAt(11, var21 != null);
          this.discoveryPanel.AboutDialog(var21);
          this.tabbedPane.setEnabledAt(12, var21 != null);
-         this.milestonesPanel.AboutDialog(var21);
+         this.milestonesPanel.updateMilestones(var21);
          this.reloadButton.setEnabled(!(this.saveFiles[this.ExosuitPanel] instanceof InMemorySaveFile));
          this.CompanionsPanel.setEnabled(true);
          this.saveAsButton.setEnabled(var20);
@@ -1027,7 +1027,7 @@ private void loadSave() {
          this.basesStoragePanel.AboutDialog((Settlement)null);
          this.settlementsPanel.AboutDialog(new SettlementState[0]);
          this.discoveryPanel.AboutDialog((Exosuit)null);
-         this.milestonesPanel.AboutDialog((Exosuit)null);
+         this.milestonesPanel.updateMilestones((Exosuit)null);
          this.tabbedPane.setEnabledAt(1, false);
          this.tabbedPane.setEnabledAt(2, false);
          this.tabbedPane.setEnabledAt(3, false);
@@ -1055,8 +1055,8 @@ private void saveAccountData() {
          this.accountData.k(this.accountJson);
          this.accountModified = false;
       } catch (Exception var2) {
-         Logger.AboutDialog("Error saving account data", var2);
-         this.AccountPanel("An error occured saving the account data.");
+         Logger.error("Error saving account data", var2);
+         this.showWarning("An error occured saving the account data.");
       }
 
    }
@@ -1067,7 +1067,7 @@ private void saveFile() {
       } else {
          try {
             Logger.info("Formatting JSON...");
-            String var1 = this.saveFiles[this.ExosuitPanel].AboutDialogCloseListener(this.currentSave);
+            String var1 = this.saveFiles[this.ExosuitPanel].writeToFile(this.currentSave);
             this.saveFiles = this.saveSlots[this.AppSettings].bX();
             this.ExosuitPanel = -1;
 
@@ -1102,7 +1102,7 @@ private void saveFile() {
 
    private void saveFileAs() {
       int var1 = this.saveSlots[this.AppSettings].getIndex();
-      int var2 = dz.AboutDialog(this.mainWindow, this.saveLocation.bU(), var1);
+      int var2 = dz.show(this.mainWindow, this.saveLocation.bU(), var1);
       if (var2 >= 0 && var2 != var1) {
          try {
             Logger.info("Formatting JSON...");
@@ -1212,11 +1212,11 @@ public List getInventoriesWithType(int var1) {
    private void showCoordinateViewer() {
       JsonObject var1 = this.currentSave.H("PlayerStateData.UniverseAddress");
       GalacticAddress var2 = GalacticAddress.saveFile(var1);
-      if ((var2 = nomanssave.aj.AboutDialog((Container)this.mainWindow, var2)) != null) {
+      if ((var2 = aj.show((Container)this.mainWindow, var2)) != null) {
          var2.saveModified(0);
-         this.currentSave.AboutDialogCloseListener("PlayerStateData.UniverseAddress", (Object)var2.ew());
-         this.currentSave.AboutDialogCloseListener("PlayerStateData.PreviousUniverseAddress", (Object)var1);
-         this.currentSave.AboutDialogCloseListener("SpawnStateData.LastKnownPlayerState", (Object)"InShip");
+         this.currentSave.setValueByPath("PlayerStateData.UniverseAddress", (Object)var2.ew());
+         this.currentSave.setValueByPath("PlayerStateData.PreviousUniverseAddress", (Object)var1);
+         this.currentSave.setValueByPath("SpawnStateData.LastKnownPlayerState", (Object)"InShip");
          this.saveModified = true;
       }
 
@@ -1236,21 +1236,21 @@ private void editAccountJson() {
          try {
             this.accountData.k(this.accountJson);
          } catch (IOException var2) {
-            Logger.AboutDialog("JSON Save error", var2);
-            this.AccountPanel("An error occured saving the account data.");
+            Logger.error("JSON Save error", var2);
+            this.showWarning("An error occured saving the account data.");
          }
       }
 
    }
 
-   private static void AboutDialog(Window var0) {
+   private static void updateComponentTreeUI(Window var0) {
       SwingUtilities.updateComponentTreeUI(var0);
       Window[] var4;
       int var3 = (var4 = var0.getOwnedWindows()).length;
 
       for(int var2 = 0; var2 < var3; ++var2) {
          Window var1 = var4[var2];
-         AboutDialog(var1);
+         updateComponentTreeUI(var1);
       }
 
    }
@@ -1258,7 +1258,7 @@ private static void AboutDialog(Window var0) {
    private void changeTheme() {
       if (nomanssave.milestonesPanel.d(this.mainWindow)) {
          nomanssave.AppSettings.descriptionLabel();
-         AboutDialog((Window)this.mainWindow);
+         updateComponentTreeUI((Window)this.mainWindow);
       }
 
    }
@@ -1302,7 +1302,7 @@ private void refreshPanels() {
       this.tabbedPane.setEnabledAt(11, var2 != null);
       this.discoveryPanel.AboutDialog(var2);
       this.tabbedPane.setEnabledAt(12, var2 != null);
-      this.milestonesPanel.AboutDialog(var2);
+      this.milestonesPanel.updateMilestones(var2);
    }
 
    private void exportJson() {
@@ -1324,8 +1324,8 @@ private void exportJson() {
 
             this.currentSave.AccountPanel(var3);
          } catch (IOException var4) {
-            Logger.AboutDialog("JSON Export error", var4);
-            this.AccountPanel("An error occured exporting the save data.");
+            Logger.error("JSON Export error", var4);
+            this.showWarning("An error occured exporting the save data.");
          }
       }
 
@@ -1345,8 +1345,8 @@ private void importJson() {
             this.currentSave.d(var2);
             this.refreshPanels();
          } catch (IOException var3) {
-            Logger.AboutDialog("JSON Import error", var3);
-            this.AccountPanel("An error occured importing the save data.");
+            Logger.error("JSON Import error", var3);
+            this.showWarning("An error occured importing the save data.");
          }
       }
 
@@ -1393,7 +1393,7 @@ private void expandAllInventories() {
       this.basesStoragePanel.expandAllInventories();
    }
 
-   public void AboutDialog(Inventory var1) {
+   public void updateInventory(Inventory var1) {
       this.exosuitPanel.AboutDialog(var1);
       this.multitoolPanel.AboutDialog(var1);
       this.shipsPanel.AboutDialog(var1);
@@ -1504,7 +1504,7 @@ public void deleteShip(int var1) {
       }
    }
 
-   public void AboutDialog(gl var1, int var2) {
+   public void deleteCompanion(gl var1, int var2) {
       JsonObject var3 = this.currentSave.H("PlayerStateData");
       JsonArray var4;
       switch(BasesStoragePanel()[var1.ordinal()]) {
@@ -1549,7 +1549,7 @@ public Frigate[] deleteFrigate(int var1) {
       for(var4 = 0; var4 < var3.size(); ++var4) {
          JsonArray var5 = var3.descriptionLabel(var4).d("AllFrigateIndices");
          if (var5.hasValue(new Integer(var1))) {
-            this.AccountPanel("This frigate is currently on a mission and cannot be deleted!");
+            this.showWarning("This frigate is currently on a mission and cannot be deleted!");
             return Frigate.d(var2);
          }
       }
@@ -1629,12 +1629,12 @@ public Frigate[] deleteFrigate(int var1) {
       return Frigate.d(var2);
    }
 
-   public Frigate[] AboutDialog(int var1, String var2) {
+   public Frigate[] renameFrigate(int var1, String var2) {
       JsonArray var3 = this.currentSave.d("PlayerStateData.FleetFrigates");
       if (var3 != null && var1 < var3.size()) {
          JsonObject var4 = var3.descriptionLabel(var1).MilestonesPanel();
          var4.d("ResourceSeed").AboutDialog(1, var2);
-         var4.AboutDialogCloseListener("CustomName", (Object)"");
+         var4.setValueByPath("CustomName", (Object)"");
          var3.selectFile(var4);
          this.saveModified = true;
       }
@@ -1673,10 +1673,10 @@ private void rechargeBasePlanters() {
             JsonObject var10 = var8.descriptionLabel(var9);
             if ("^MAINT_FARM5".equals(var10.getValueAsString("Id"))) {
                if ((var4 = var10.J("MaxAmount")) > 0 && var10.J("Amount") < var4) {
-                  var10.AboutDialogCloseListener("Amount", (Object)(new Integer(var4)));
+                  var10.setValueByPath("Amount", (Object)(new Integer(var4)));
                }
 
-               var11.AboutDialogCloseListener("LastUpdateTimestamp", (Object)(new Integer(var1)));
+               var11.setValueByPath("LastUpdateTimestamp", (Object)(new Integer(var1)));
                this.saveModified = true;
                --var2;
             }
@@ -1904,7 +1904,7 @@ private void initialize() {
             }
          }
 
-         en.AccountPanel(var3);
+         en.setEnabled(var3);
       });
       var9.add(var14);
       var9.addSeparator();
@@ -1990,27 +1990,27 @@ private static String e(String var0) {
    }
 
    // $FF: synthetic method
-   static boolean AboutDialog(Application var0) {
+   static boolean access$isFileLoading(Application var0) {
       return var0.aQ;
    }
 
    // $FF: synthetic method
-   static SaveLocation AboutDialogCloseListener(Application var0) {
+   static SaveLocation access$getSaveLocation(Application var0) {
       return var0.saveLocation;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(Application var0, boolean var1) {
+   static void access$setSlotChanged(Application var0, boolean var1) {
       var0.aR = var1;
    }
 
    // $FF: synthetic method
-   static void AboutDialogCloseListener(Application var0, boolean var1) {
+   static void access$setFileChanged(Application var0, boolean var1) {
       var0.aS = var1;
    }
 
    // $FF: synthetic method
-   static int AccountPanel(Application var0) {
+   static int access$getSlotIndex(Application var0) {
       return var0.AppSettings;
    }
 
@@ -2020,7 +2020,7 @@ static SaveSlot[] d(Application var0) {
    }
 
    // $FF: synthetic method
-   static void AccountPanel(Application var0, boolean var1) {
+   static void access$setAccountPanelChanged(Application var0, boolean var1) {
       var0.aT = var1;
    }
 
@@ -2123,7 +2123,7 @@ static void f(Application var0, boolean var1) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(Application var0, int var1) {
+   static void access$selectSlot(Application var0, int var1) {
       var0.e(var1);
    }
 
@@ -2133,12 +2133,12 @@ static JComboBox saveFileAs(Application var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(Application var0, SaveFile[] var1) {
+   static void access$setSaveFiles(Application var0, SaveFile[] var1) {
       var0.saveFiles = var1;
    }
 
    // $FF: synthetic method
-   static void AboutDialogCloseListener(Application var0, int var1) {
+   static void access$selectFile(Application var0, int var1) {
       var0.selectFile(var1);
    }
 
diff --git a/nomanssave/BackupUtil.java b/nomanssave/BackupUtil.java
index d285548..af14245 100644
--- a/nomanssave/BackupUtil.java
+++ b/nomanssave/BackupUtil.java
@@ -22,7 +22,7 @@ public class BackupUtil {
    private static byte[] lA = new byte[]{78, 77, 83, 66};
    private static byte[] rS = new byte[]{50, -99, -78, -55, 92, 88, -34, 74, -57, 17, 57, -108, -94, 127, 97, -79};
 
-   private static double[] AboutDialog(JsonObject var0, String var1) {
+   private static double[] readDoubleArray(JsonObject var0, String var1) {
       JsonArray var2 = var0.d(var1);
       if (var2.size() != 3) {
          throw new RuntimeException("Invalid " + var1 + " coordinates");
@@ -31,30 +31,30 @@ private static double[] AboutDialog(JsonObject var0, String var1) {
       }
    }
 
-   private static void AboutDialog(JsonObject var0, String var1, double[] var2) {
+   private static void writeDoubleArray(JsonObject var0, String var1, double[] var2) {
       var0.AboutDialogCloseListener(var1, (Object)(new JsonArray(new Object[]{new Double(Double.isNaN(var2[0]) ? 0.0D : var2[0]), new Double(Double.isNaN(var2[1]) ? 0.0D : var2[1]), new Double(Double.isNaN(var2[2]) ? 0.0D : var2[2])})));
    }
 
    public static void d(JsonObject var0, File var1) {
-      AboutDialog(var0, Collections.emptyMap(), var1);
+      saveBackup(var0, Collections.emptyMap(), var1);
    }
 
-   public static void AboutDialog(JsonObject var0, Map var1, File var2) {
+   public static void saveBackup(JsonObject var0, Map var1, File var2) {
       int var3 = var0.J("BaseVersion");
       JsonArray var4 = var0.d("Objects").bA();
       if (var3 < 3) {
-         double[] var5 = AboutDialog(var0, "Position");
-         double[] var6 = AboutDialog(var0, "Forward");
+         double[] var5 = readDoubleArray(var0, "Position");
+         double[] var6 = readDoubleArray(var0, "Forward");
          CoordinateTransform var7 = new CoordinateTransform(var5, var6);
 
          for(int var8 = 0; var8 < var4.size(); ++var8) {
             JsonObject var9 = var4.V(var8);
-            double[] var10 = AboutDialog(var9, "Position");
-            double[] var11 = AboutDialog(var9, "Up");
-            double[] var12 = AboutDialog(var9, "At");
-            AboutDialog(var9, "Position", var7.d(var10));
-            AboutDialog(var9, "Up", var7.d(var11));
-            AboutDialog(var9, "At", var7.d(var12));
+            double[] var10 = readDoubleArray(var9, "Position");
+            double[] var11 = readDoubleArray(var9, "Up");
+            double[] var12 = readDoubleArray(var9, "At");
+            writeDoubleArray(var9, "Position", var7.d(var10));
+            writeDoubleArray(var9, "Up", var7.d(var11));
+            writeDoubleArray(var9, "At", var7.d(var12));
          }
       }
 
@@ -73,9 +73,9 @@ public static void AboutDialog(JsonObject var0, Map var1, File var2) {
          ((OutputStream)var22).write(var19);
          var22 = new CipherOutputStream((OutputStream)var22, var21);
          ((OutputStream)var22).write(new byte[]{84, 82, 85, 69});
-         hk.AboutDialog((OutputStream)var22, var17);
+         hk.writeInt((OutputStream)var22, var17);
          byte[] var23 = JsonWriter.AboutDialogCloseListener(var4);
-         hk.AboutDialog((OutputStream)var22, var23.length);
+         hk.writeInt((OutputStream)var22, var23.length);
          ((OutputStream)var22).write(var23);
          Iterator var13 = var1.entrySet().iterator();
 
@@ -86,7 +86,7 @@ public static void AboutDialog(JsonObject var0, Map var1, File var2) {
                ((OutputStream)var22).write(var23.length);
                ((OutputStream)var22).write(var23);
                var23 = JsonWriter.j(var24.getValue());
-               hk.AboutDialog((OutputStream)var22, var23.length);
+               hk.writeInt((OutputStream)var22, var23.length);
                ((OutputStream)var22).write(var23);
             }
          }
@@ -98,10 +98,10 @@ public static void AboutDialog(JsonObject var0, Map var1, File var2) {
    }
 
    public static void e(JsonObject var0, File var1) {
-      AboutDialogCloseListener(var0, Collections.emptyMap(), var1);
+      loadBackup(var0, Collections.emptyMap(), var1);
    }
 
-   public static void AboutDialogCloseListener(JsonObject var0, Map var1, File var2) {
+   public static void loadBackup(JsonObject var0, Map var1, File var2) {
       Object var4 = new FileInputStream(var2);
 
       int var3;
@@ -162,7 +162,7 @@ public static void AboutDialogCloseListener(JsonObject var0, Map var1, File var2
                   throw new IOException("short read");
                }
 
-               var0.AboutDialogCloseListener("UserData", (Object)(var11 << 24 | var12 << 16 | var13 << 8 | var14));
+               var0.setValueByPath("UserData", (Object)(var11 << 24 | var12 << 16 | var13 << 8 | var14));
                ByteArrayOutputStream var15 = new ByteArrayOutputStream();
                byte[] var16 = new byte[8096];
 
@@ -173,7 +173,7 @@ public static void AboutDialogCloseListener(JsonObject var0, Map var1, File var2
 
                var5 = BinaryReader.AccountPanel(var15.toByteArray());
             } else {
-               var0.AboutDialogCloseListener("UserData", (Object)hk.readInt((InputStream)var4));
+               var0.setValueByPath("UserData", (Object)hk.readInt((InputStream)var4));
                var11 = hk.readInt((InputStream)var4);
                byte[] var26 = new byte[var11];
                hk.readFully((InputStream)var4, var26);
@@ -210,44 +210,44 @@ public static void AboutDialogCloseListener(JsonObject var0, Map var1, File var2
       if (var3 == 3) {
          for(var22 = 0; var22 < var5.size(); ++var22) {
             var23 = var5.V(var22);
-            double[] var24 = AboutDialog(var23, "Position");
+            double[] var24 = readDoubleArray(var23, "Position");
             var24[0] += 3.0D;
             var24[2] += 3.0D;
-            AboutDialog(var24);
-            AboutDialog(var23, "Position", var24);
-            double[] var25 = AboutDialog(var23, "Up");
-            AboutDialog(var25);
-            AboutDialog(var23, "Up", var25);
-            double[] var27 = AboutDialog(var23, "At");
-            AboutDialog(var27);
-            AboutDialog(var23, "At", var27);
+            normalizeDoubleArray(var24);
+            writeDoubleArray(var23, "Position", var24);
+            double[] var25 = readDoubleArray(var23, "Up");
+            normalizeDoubleArray(var25);
+            writeDoubleArray(var23, "Up", var25);
+            double[] var27 = readDoubleArray(var23, "At");
+            normalizeDoubleArray(var27);
+            writeDoubleArray(var23, "At", var27);
          }
 
          var22 = var0.J("UserData");
-         var5.add(0, AboutDialog("^BASE_FLAG", var21, var22, new double[]{0.0D, 0.0D, 0.0D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{0.0D, 0.0D, 1.0D}));
-         var5.add(1, AboutDialog("^MAINROOM", var21, var22, new double[]{-3.0D, 0.0D, 3.0D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{0.0D, 0.0D, -1.0D}));
-         var5.add(2, AboutDialog("^TELEPORTER", var21, var22, new double[]{0.0D, 0.0D, 6.0D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{-0.7071069478988647D, 0.0D, -0.7071067094802856D}));
-         var5.add(3, AboutDialog("^BUILDDOOR", var21, var22, new double[]{-9.005859375D, 0.2421875D, 2.98828125D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{-1.0D, 0.0D, 0.0D}));
-         var5.add(4, AboutDialog("^BUILDRAMP", var21, var22, new double[]{-10.724609375D, 0.296875D, 2.98828125D}, new double[]{-0.2588191032409668D, 0.9659259915351868D, 2.9802322387695312E-8D}, new double[]{-0.9659258127212524D, -0.2588191628456116D, -3.2782554626464844E-7D}));
-         var5.add(5, AboutDialog("^BUILDWINDOW", var21, var22, new double[]{-7.248046875D, 0.5D, -1.25D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{-0.7071069478988647D, 0.0D, -0.7071067094802856D}));
-         var5.add(6, AboutDialog("^BUILDWINDOW", var21, var22, new double[]{-7.248046875D, 0.5D, 7.25D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{-0.7071069478988647D, 0.0D, 0.7071067094802856D}));
-         var5.add(7, AboutDialog("^BUILDWINDOW", var21, var22, new double[]{1.248046875D, 0.5D, -1.25D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{0.7071069478988647D, 0.0D, -0.7071067094802856D}));
+         var5.add(0, buildBackupJson("^BASE_FLAG", var21, var22, new double[]{0.0D, 0.0D, 0.0D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{0.0D, 0.0D, 1.0D}));
+         var5.add(1, buildBackupJson("^MAINROOM", var21, var22, new double[]{-3.0D, 0.0D, 3.0D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{0.0D, 0.0D, -1.0D}));
+         var5.add(2, buildBackupJson("^TELEPORTER", var21, var22, new double[]{0.0D, 0.0D, 6.0D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{-0.7071069478988647D, 0.0D, -0.7071067094802856D}));
+         var5.add(3, buildBackupJson("^BUILDDOOR", var21, var22, new double[]{-9.005859375D, 0.2421875D, 2.98828125D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{-1.0D, 0.0D, 0.0D}));
+         var5.add(4, buildBackupJson("^BUILDRAMP", var21, var22, new double[]{-10.724609375D, 0.296875D, 2.98828125D}, new double[]{-0.2588191032409668D, 0.9659259915351868D, 2.9802322387695312E-8D}, new double[]{-0.9659258127212524D, -0.2588191628456116D, -3.2782554626464844E-7D}));
+         var5.add(5, buildBackupJson("^BUILDWINDOW", var21, var22, new double[]{-7.248046875D, 0.5D, -1.25D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{-0.7071069478988647D, 0.0D, -0.7071067094802856D}));
+         var5.add(6, buildBackupJson("^BUILDWINDOW", var21, var22, new double[]{-7.248046875D, 0.5D, 7.25D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{-0.7071069478988647D, 0.0D, 0.7071067094802856D}));
+         var5.add(7, buildBackupJson("^BUILDWINDOW", var21, var22, new double[]{1.248046875D, 0.5D, -1.25D}, new double[]{0.0D, 1.0D, 0.0D}, new double[]{0.7071069478988647D, 0.0D, -0.7071067094802856D}));
       }
 
       if (var3 < 5) {
-         var0.AboutDialogCloseListener("BaseVersion", (int)3);
+         var0.setValueByPath("BaseVersion", (int)3);
       }
 
-      var0.AboutDialogCloseListener("Objects", (Object)var5);
+      var0.setValueByPath("Objects", (Object)var5);
    }
 
-   private static void AboutDialog(double[] var0) {
+   private static void normalizeDoubleArray(double[] var0) {
       double var1 = var0[0];
       var0[0] = -var0[2];
       var0[2] = var1;
    }
 
-   private static JsonObject AboutDialog(String var0, long var1, int var3, double[] var4, double[] var5, double[] var6) {
+   private static JsonObject buildBackupJson(String var0, long var1, int var3, double[] var4, double[] var5, double[] var6) {
       JsonObject var7 = new JsonObject();
       var7.put("Timestamp", new Long(var1));
       var7.put("ObjectID", var0);
diff --git a/nomanssave/Base.java b/nomanssave/Base.java
index bee2b72..7eb32bc 100644
--- a/nomanssave/Base.java
+++ b/nomanssave/Base.java
@@ -28,7 +28,7 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.nj.AboutDialogCloseListener("Name", (Object)var1);
+      this.nj.setValueByPath("Name", (Object)var1);
    }
 
    public int cG() {
@@ -51,8 +51,8 @@ public List cI() {
       return var1;
    }
 
-   public boolean AboutDialog(gg var1) {
-      return gV.AboutDialog(this.nj, var1.nl);
+   public boolean matchesPosition(gg var1) {
+      return gV.swapObject(this.nj, var1.nl);
    }
 
    public String toString() {
diff --git a/nomanssave/BasesStoragePanel.java b/nomanssave/BasesStoragePanel.java
index 786f98d..3c13d34 100644
--- a/nomanssave/BasesStoragePanel.java
+++ b/nomanssave/BasesStoragePanel.java
@@ -23,22 +23,22 @@ public class BasesStoragePanel extends SplitFormPanel {
 
    BasesStoragePanel(Application var1) {
       this.bh.setModel(new J(this));
-      this.AboutDialog("Base NPC", true, this.bh);
+      this.addRow("Base NPC", true, this.bh);
       this.bi = new JTextField();
       this.bi.setEnabled(false);
-      this.AboutDialog("Race", this.bi);
+      this.addRow("Race", this.bi);
       this.bj = new K(this);
       this.bj.setEnabled(false);
-      this.AboutDialog("Seed", this.bj);
+      this.addRow("Seed", this.bj);
       this.Y();
       this.bk = new JComboBox();
       this.bk.setModel(new L(this));
-      this.AboutDialog("Base Info", true, this.bk);
+      this.addRow("Base Info", true, this.bk);
       this.FrigatesPanel = new M(this);
-      this.AboutDialog("Name", this.FrigatesPanel);
+      this.addRow("Name", this.FrigatesPanel);
       this.bm = new JTextField();
       this.bm.setEnabled(false);
-      this.AboutDialog("Items", this.bm);
+      this.addRow("Items", this.bm);
       JPanel var2 = new JPanel();
       this.bn = new JButton("Backup");
       this.bn.addActionListener(new N(this, var1));
@@ -49,9 +49,9 @@ public class BasesStoragePanel extends SplitFormPanel {
       this.bp = new JButton("Move Base Computer");
       this.bp.addActionListener(new P(this, var1));
       var2.add(this.bp);
-      this.AboutDialog((JComponent)var2);
+      this.addRow((JComponent)var2);
       this.bq = new InventoryPanel(var1);
-      this.AboutDialogCloseListener(this.bq);
+      this.setRightComponent(this.bq);
    }
 
    void AppStartupRunnable() {
@@ -70,15 +70,15 @@ void ShowWarningRunnable() {
       this.bq.ShowWarningRunnable();
    }
 
-   void AboutDialog(Inventory var1) {
-      this.bq.AboutDialog(var1);
+   void updateInventory(Inventory var1) {
+      this.bq.updateInventory(var1);
    }
 
    Settlement O() {
       return this.br;
    }
 
-   void AboutDialog(Settlement var1) {
+   void updateSettlement(Settlement var1) {
       this.br = var1;
       List var2;
       if (var1 == null) {
@@ -93,21 +93,21 @@ void AboutDialog(Settlement var1) {
 
       this.bh.updateUI();
       this.bk.updateUI();
-      this.bq.AboutDialog(var2);
+      this.bq.updateInventory(var2);
    }
 
    // $FF: synthetic method
-   static Settlement AboutDialog(BasesStoragePanel var0) {
+   static Settlement access$getSettlement(BasesStoragePanel var0) {
       return var0.br;
    }
 
    // $FF: synthetic method
-   static JTextField AboutDialogCloseListener(BasesStoragePanel var0) {
+   static JTextField access$getNameField(BasesStoragePanel var0) {
       return var0.bi;
    }
 
    // $FF: synthetic method
-   static ValidatedTextField AccountPanel(BasesStoragePanel var0) {
+   static ValidatedTextField access$getStorageField(BasesStoragePanel var0) {
       return var0.bj;
    }
 
diff --git a/nomanssave/BinaryReader.java b/nomanssave/BinaryReader.java
index 10624fd..480d065 100644
--- a/nomanssave/BinaryReader.java
+++ b/nomanssave/BinaryReader.java
@@ -21,7 +21,7 @@ public class BinaryReader implements Closeable {
    private int kR;
    private final CharsetDecoder kS;
 
-   public static Object AboutDialog(byte[] var0) {
+   public static Object parse(byte[] var0) {
       Throwable var1 = null;
       Object var2 = null;
 
@@ -71,7 +71,7 @@ public static Object AboutDialog(byte[] var0) {
       }
    }
 
-   public static JsonObject AboutDialogCloseListener(byte[] var0) {
+   public static JsonObject parseJsonObject(byte[] var0) {
       Throwable var1 = null;
       Object var2 = null;
 
@@ -121,7 +121,7 @@ public static JsonObject AboutDialogCloseListener(byte[] var0) {
       }
    }
 
-   public static JsonArray AccountPanel(byte[] var0) {
+   public static JsonArray parseJsonArray(byte[] var0) {
       Throwable var1 = null;
       Object var2 = null;
 
@@ -192,7 +192,7 @@ private int read() {
       }
    }
 
-   private int AboutDialog(Predicate var1) {
+   private int findKey(Predicate var1) {
       if (this.kR < 0) {
          this.kR = this.in.read();
       }
@@ -261,7 +261,7 @@ public void close() {
    }
 
    public Object bJ() {
-      return this.AboutDialog(this.bI(), (eC)null);
+      return this.readValue(this.bI(), (eC)null);
    }
 
    public JsonObject bK() {
@@ -271,11 +271,11 @@ public JsonObject bK() {
       } else if (var1 != 123) {
          throw new JsonParseException("Unexpected token");
       } else {
-         return this.AboutDialog((eC)null);
+         return this.readJsonObject((eC)null);
       }
    }
 
-   public JsonObject AboutDialog(eG var1) {
+   public JsonObject readJsonObject(eG var1) {
       int var2 = this.bI();
       if (var2 < 0) {
          throw new JsonParseException("Short read");
@@ -293,7 +293,7 @@ public JsonObject AboutDialog(eG var1) {
             while(true) {
                String var6 = this.bN();
                if (var3 == null) {
-                  if (var1 != null && (var4 = eC.AboutDialog(var1, var6)) != null) {
+                  if (var1 != null && (var4 = eC.findEncoding(var1, var6)) != null) {
                      var3 = new fk(var4);
                   } else {
                      var3 = new JsonObject();
@@ -308,7 +308,7 @@ public JsonObject AboutDialog(eG var1) {
                   throw new JsonParseException("Invalid token");
                }
 
-               Object var7 = this.AboutDialog(this.bI(), var4);
+               Object var7 = this.readValue(this.bI(), var4);
                ((JsonObject)var3).AboutDialog(var6, var7);
                var5 = this.bI();
                if (var5 == 125) {
@@ -352,17 +352,17 @@ public JsonArray bL() {
       } else if (var1 != 91) {
          throw new JsonParseException("Unexpected token");
       } else {
-         return this.AboutDialogCloseListener((eC)null);
+         return this.readJsonArray((eC)null);
       }
    }
 
-   private Object AboutDialog(int var1, eC var2) {
+   private Object readValue(int var1, eC var2) {
       if (var1 < 0) {
          throw new JsonParseException("Short read");
       } else if (var1 == 123) {
-         return this.AboutDialog(var2);
+         return this.readJsonObject(var2);
       } else if (var1 == 91) {
-         return this.AboutDialogCloseListener(var2);
+         return this.readJsonArray(var2);
       } else if (var1 == 34) {
          return this.InventoryPanel();
       } else if (var1 == 116) {
@@ -407,7 +407,7 @@ private Object AboutDialog(int var1, eC var2) {
    private Number ad(int var1) {
       boolean var3 = false;
       if (var1 == 45) {
-         var1 = this.AboutDialog(JsonParser.kZ);
+         var1 = this.findKey(JsonParser.kZ);
          if (var1 < 0) {
             throw new JsonParseException("Invalid token");
          }
@@ -417,15 +417,15 @@ private Number ad(int var1) {
 
       BigDecimal var2 = new BigDecimal(var1 - 48);
       if (var1 != 48) {
-         while((var1 = this.AboutDialog(JsonParser.kZ)) >= 0) {
+         while((var1 = this.findKey(JsonParser.kZ)) >= 0) {
             var2 = var2.multiply(BigDecimal.TEN).add(new BigDecimal(var1 - 48));
          }
       }
 
       boolean var4 = true;
-      if (this.AboutDialog(JsonParser.la) >= 0) {
+      if (this.findKey(JsonParser.la) >= 0) {
          var4 = false;
-         var1 = this.AboutDialog(JsonParser.kZ);
+         var1 = this.findKey(JsonParser.kZ);
          if (var1 < 0) {
             throw new JsonParseException("Invalid token");
          }
@@ -436,16 +436,16 @@ private Number ad(int var1) {
             BigDecimal var10001 = new BigDecimal(var1 - 48);
             --var5;
             var2 = var2.add(var10001.scaleByPowerOfTen(var5));
-         } while((var1 = this.AboutDialog(JsonParser.kZ)) >= 0);
+         } while((var1 = this.findKey(JsonParser.kZ)) >= 0);
       }
 
-      if (this.AboutDialog(JsonParser.lb) >= 0) {
+      if (this.findKey(JsonParser.lb) >= 0) {
          var4 = false;
-         var1 = this.AboutDialog(JsonParser.lc);
+         var1 = this.findKey(JsonParser.lc);
          boolean var9 = false;
          if (var1 == 43 || var1 == 45) {
             var9 = var1 == 45;
-            var1 = this.AboutDialog(JsonParser.kZ);
+            var1 = this.findKey(JsonParser.kZ);
          }
 
          if (var1 < 0) {
@@ -457,7 +457,7 @@ private Number ad(int var1) {
          do {
             var6 *= 10;
             var6 += var1 - 48;
-         } while((var1 = this.AboutDialog(JsonParser.kZ)) >= 0);
+         } while((var1 = this.findKey(JsonParser.kZ)) >= 0);
 
          if (var9) {
             var6 = -var6;
@@ -484,7 +484,7 @@ private Number ad(int var1) {
       return var2;
    }
 
-   private JsonObject AboutDialog(eC var1) {
+   private JsonObject readJsonObject(eC var1) {
       JsonObject var2 = new JsonObject();
       int var3 = this.bI();
       if (var3 != 34) {
@@ -502,7 +502,7 @@ private JsonObject AboutDialog(eC var1) {
                throw new JsonParseException("Invalid token");
             }
 
-            Object var5 = this.AboutDialog(this.bI(), var1);
+            Object var5 = this.readValue(this.bI(), var1);
             var2.AboutDialog(var4, var5);
             var3 = this.bI();
             if (var3 == 125) {
@@ -523,12 +523,12 @@ private JsonObject AboutDialog(eC var1) {
       return var2;
    }
 
-   private JsonArray AboutDialogCloseListener(eC var1) {
+   private JsonArray readJsonArray(eC var1) {
       JsonArray var2 = new JsonArray();
       int var3;
       if ((var3 = this.bI()) != 93) {
          while(true) {
-            Object var4 = this.AboutDialog(var3, var1);
+            Object var4 = this.readValue(var3, var1);
             var2.e(var4);
             var3 = this.bI();
             if (var3 == 93) {
diff --git a/nomanssave/C.java b/nomanssave/C.java
index de22992..28650cb 100644
--- a/nomanssave/C.java
+++ b/nomanssave/C.java
@@ -15,13 +15,13 @@ class C extends ComponentAdapter {
 
    public void componentMoved(ComponentEvent var1) {
       Point var2 = Application.h(this.aZ).getBounds().getLocation();
-      AppSettings.AboutDialogCloseListener("MainFrame.X", var2.UpdateCheckThread);
-      AppSettings.AboutDialogCloseListener("MainFrame.Y", var2.UpdateDownloadRunnable);
+      AppSettings.setValueByPath("MainFrame.X", var2.UpdateCheckThread);
+      AppSettings.setValueByPath("MainFrame.Y", var2.UpdateDownloadRunnable);
    }
 
    public void componentResized(ComponentEvent var1) {
       Dimension var2 = Application.h(this.aZ).getBounds().getSize();
-      AppSettings.AboutDialogCloseListener("MainFrame.Width", var2.width);
-      AppSettings.AboutDialogCloseListener("MainFrame.Height", var2.height);
+      AppSettings.setValueByPath("MainFrame.Width", var2.width);
+      AppSettings.setValueByPath("MainFrame.Height", var2.height);
    }
 }
diff --git a/nomanssave/Companion.java b/nomanssave/Companion.java
index 1fa72d3..307a48c 100644
--- a/nomanssave/Companion.java
+++ b/nomanssave/Companion.java
@@ -41,7 +41,7 @@ public static Companion[] fromPlayerData(JsonObject var0) {
       return (Companion[])var1.toArray(new Companion[0]);
    }
 
-   public static Companion AboutDialog(JsonObject var0, File var1) {
+   public static Companion importFromFile(JsonObject var0, File var1) {
       JsonArray var2 = null;
       gl var3 = null;
       if (var1.getName().endsWith(".pet")) {
@@ -162,7 +162,7 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.bf.AboutDialogCloseListener("CustomName", (Object)var1);
+      this.bf.setValueByPath("CustomName", (Object)var1);
    }
 
    public String cM() {
@@ -199,7 +199,7 @@ public String cO() {
    }
 
    public void ac(String var1) {
-      this.bf.AboutDialogCloseListener("SpeciesSeed", (Object)var1);
+      this.bf.setValueByPath("SpeciesSeed", (Object)var1);
    }
 
    public String cP() {
@@ -207,7 +207,7 @@ public String cP() {
    }
 
    public void ad(String var1) {
-      this.bf.AboutDialogCloseListener("GenusSeed", (Object)var1);
+      this.bf.setValueByPath("GenusSeed", (Object)var1);
    }
 
    public boolean cQ() {
@@ -215,7 +215,7 @@ public boolean cQ() {
    }
 
    public void d(boolean var1) {
-      this.bf.AboutDialogCloseListener("Predator", (Object)var1);
+      this.bf.setValueByPath("Predator", (Object)var1);
    }
 
    public String cR() {
@@ -223,7 +223,7 @@ public String cR() {
    }
 
    public void ae(String var1) {
-      this.bf.AboutDialogCloseListener("Biome.Biome", (Object)var1);
+      this.bf.setValueByPath("Biome.Biome", (Object)var1);
    }
 
    public String cS() {
@@ -231,7 +231,7 @@ public String cS() {
    }
 
    public void af(String var1) {
-      this.bf.AboutDialogCloseListener("CreatureType.CreatureType", (Object)var1);
+      this.bf.setValueByPath("CreatureType.CreatureType", (Object)var1);
    }
 
    public String toString() {
diff --git a/nomanssave/CompanionsPanel.java b/nomanssave/CompanionsPanel.java
index 25114d5..06b9b62 100644
--- a/nomanssave/CompanionsPanel.java
+++ b/nomanssave/CompanionsPanel.java
@@ -32,25 +32,25 @@ public class CompanionsPanel extends JPanel {
       this.add(new JPanel());
       this.bG = new JComboBox();
       this.bG.setModel(new Y(this));
-      var3.AboutDialog("Companion", true, this.bG);
+      var3.addRow("Companion", true, this.bG);
       this.bH = new JComboBox();
       this.bH.setModel(new ab(this));
       this.bH.setEnabled(false);
-      var3.AboutDialog("Type", (JComponent)this.bH);
+      var3.addRow("Type", (JComponent)this.bH);
       this.bI = new ac(this);
-      var3.AboutDialog("Name", (JComponent)this.bI);
+      var3.addRow("Name", (JComponent)this.bI);
       this.bJ = new ad(this);
-      var3.AboutDialog("Creature Seed", this.bJ);
+      var3.addRow("Creature Seed", this.bJ);
       this.bK = new ae(this);
-      var3.AboutDialog("Secondary Seed", (JComponent)this.bK);
+      var3.addRow("Secondary Seed", (JComponent)this.bK);
       this.bL = new af(this);
-      var3.AboutDialog("Species Seed", (JComponent)this.bL);
+      var3.addRow("Species Seed", (JComponent)this.bL);
       this.bM = new ag(this);
-      var3.AboutDialog("Genus Seed", (JComponent)this.bM);
+      var3.addRow("Genus Seed", (JComponent)this.bM);
       this.bN = new JCheckBox("Predator");
       this.bN.setEnabled(false);
       this.bN.addActionListener(new ah(this));
-      var3.AboutDialog((String)null, (JComponent)this.bN);
+      var3.addRow((String)null, (JComponent)this.bN);
       this.InventoryPanel = new cN(gi.class);
       this.InventoryPanel.AboutDialog((var1x) -> {
          Companion var2 = (Companion)this.bG.getSelectedItem();
@@ -59,7 +59,7 @@ public class CompanionsPanel extends JPanel {
          }
 
       });
-      var3.AboutDialog("Biome", (JComponent)this.InventoryPanel);
+      var3.addRow("Biome", (JComponent)this.InventoryPanel);
       this.bP = new cN(CompanionGenus.class);
       this.bP.AboutDialog((var1x) -> {
          Companion var2 = (Companion)this.bG.getSelectedItem();
@@ -68,7 +68,7 @@ public class CompanionsPanel extends JPanel {
          }
 
       });
-      var3.AboutDialog("Type", (JComponent)this.bP);
+      var3.addRow("Type", (JComponent)this.bP);
       var3.Y();
       JPanel var4 = new JPanel();
       this.bQ = new JButton("Delete");
@@ -80,10 +80,10 @@ public class CompanionsPanel extends JPanel {
       this.InventorySlotPanel = new JButton("Import");
       this.InventorySlotPanel.addActionListener(new aa(this, var1));
       var4.add(this.InventorySlotPanel);
-      var3.AboutDialog(var4);
+      var3.addRow(var4);
    }
 
-   void AboutDialog(Companion[] var1) {
+   void updateCompanions(Companion[] var1) {
       this.bT = var1;
       if (var1.length == 0) {
          this.bG.setSelectedIndex(-1);
@@ -95,17 +95,17 @@ void AboutDialog(Companion[] var1) {
    }
 
    // $FF: synthetic method
-   static Companion[] AboutDialog(CompanionsPanel var0) {
+   static Companion[] access$getCompanions(CompanionsPanel var0) {
       return var0.bT;
    }
 
    // $FF: synthetic method
-   static JComboBox AboutDialogCloseListener(CompanionsPanel var0) {
+   static JComboBox access$getNameCombo(CompanionsPanel var0) {
       return var0.bH;
    }
 
    // $FF: synthetic method
-   static ValidatedTextField AccountPanel(CompanionsPanel var0) {
+   static ValidatedTextField access$getSeedField(CompanionsPanel var0) {
       return var0.bI;
    }
 
@@ -150,7 +150,7 @@ static JComboBox k(CompanionsPanel var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(CompanionsPanel var0, Companion[] var1) {
+   static void access$setCompanions(CompanionsPanel var0, Companion[] var1) {
       var0.bT = var1;
    }
 }
diff --git a/nomanssave/CoordinateTransform.java b/nomanssave/CoordinateTransform.java
index 08dbe61..55c9b43 100644
--- a/nomanssave/CoordinateTransform.java
+++ b/nomanssave/CoordinateTransform.java
@@ -10,7 +10,7 @@ public class CoordinateTransform {
    private final double[] rW;
    private final double[] rX;
 
-   private static double[] AboutDialogCloseListener(double[] var0) {
+   private static double[] normalize(double[] var0) {
       double var1 = Math.sqrt(var0[0] * var0[0] + var0[1] * var0[1] + var0[2] * var0[2]);
       if (var1 < 0.1D) {
          throw new RuntimeException("vector cannot be normalized");
@@ -37,16 +37,16 @@ public CoordinateTransform(double[] var1, double[] var2) {
          this.rV = new double[]{1.0D, 0.0D, 0.0D};
       } else {
          var1 = new double[]{var1[0] / var3, var1[1] / var3, var1[2] / var3};
-         var2 = AboutDialogCloseListener(var2);
+         var2 = normalize(var2);
          double var5 = var2[0] * var1[0] + var2[1] * var1[1] + var2[2] * var1[2];
          this.rX = var2;
-         this.rW = AboutDialogCloseListener(new double[]{var1[0] - var5 * var2[0], var1[1] - var5 * var2[1], var1[2] - var5 * var2[2]});
-         this.rV = AboutDialogCloseListener(new double[]{this.rW[1] * var2[2] - this.rW[2] * var2[1], this.rW[2] * var2[0] - this.rW[0] * var2[2], this.rW[0] * var2[1] - this.rW[1] * var2[0]});
+         this.rW = normalize(new double[]{var1[0] - var5 * var2[0], var1[1] - var5 * var2[1], var1[2] - var5 * var2[2]});
+         this.rV = normalize(new double[]{this.rW[1] * var2[2] - this.rW[2] * var2[1], this.rW[2] * var2[0] - this.rW[0] * var2[2], this.rW[0] * var2[1] - this.rW[1] * var2[0]});
       }
 
    }
 
-   private static double[] AboutDialog(double var0, double[] var2, double[] var3) {
+   private static double[] lerp(double var0, double[] var2, double[] var3) {
       double var4 = Math.cos(var0);
       double var6 = -Math.sin(var0);
       double var8 = var3[0];
@@ -69,25 +69,25 @@ private static double[] AboutDialog(double var0, double[] var2, double[] var3) {
       return new double[]{var15 / var21, var17 / var21, var19 / var21};
    }
 
-   public double[] AboutDialog(gU var1) {
+   public double[] toLocalCoords(gU var1) {
       if (var1.rY.equals("fr")) {
-         return AboutDialog(var1.rZ, this.rX, this.rV);
+         return lerp(var1.rZ, this.rX, this.rV);
       } else if (var1.rY.equals("fu")) {
-         return AboutDialog(var1.rZ, this.rX, this.rW);
+         return lerp(var1.rZ, this.rX, this.rW);
       } else if (var1.rY.equals("ur")) {
-         return AboutDialog(var1.rZ, this.rW, this.rV);
+         return lerp(var1.rZ, this.rW, this.rV);
       } else if (var1.rY.equals("uf")) {
-         return AboutDialog(var1.rZ, this.rW, this.rX);
+         return lerp(var1.rZ, this.rW, this.rX);
       } else if (var1.rY.equals("ru")) {
-         return AboutDialog(var1.rZ, this.rV, this.rW);
+         return lerp(var1.rZ, this.rV, this.rW);
       } else if (var1.rY.equals("rf")) {
-         return AboutDialog(var1.rZ, this.rV, this.rX);
+         return lerp(var1.rZ, this.rV, this.rX);
       } else {
          throw new RuntimeException("Unsupported rotation axis");
       }
    }
 
-   public double[] AccountPanel(double[] var1) {
+   public double[] transformToWorld(double[] var1) {
       double var2 = var1[0] * this.rV[0] + var1[1] * this.rW[0] + var1[2] * this.rX[0];
       double var4 = var1[0] * this.rV[1] + var1[1] * this.rW[1] + var1[2] * this.rX[1];
       double var6 = var1[0] * this.rV[2] + var1[1] * this.rW[2] + var1[2] * this.rX[2];
@@ -101,11 +101,11 @@ public double[] d(double[] var1) {
       return new double[]{var2, var4, var6};
    }
 
-   private void AboutDialog(double[] var1, StringBuffer var2, StringBuffer var3, StringBuffer var4, int var5) {
+   private void appendCoords(double[] var1, StringBuffer var2, StringBuffer var3, StringBuffer var4, int var5) {
       int var6 = var2.length();
-      var2.append(AboutDialog(var1[0], var5));
-      var3.append(AboutDialog(var1[1], var5));
-      var4.append(AboutDialog(var1[2], var5));
+      var2.append(formatComponent(var1[0], var5));
+      var3.append(formatComponent(var1[1], var5));
+      var4.append(formatComponent(var1[2], var5));
       int var7 = Math.max(Math.max(var2.length(), var3.length()), var4.length());
 
       while(var2.length() < var7) {
@@ -122,7 +122,7 @@ private void AboutDialog(double[] var1, StringBuffer var2, StringBuffer var3, St
 
    }
 
-   private void AboutDialog(StringBuffer var1, StringBuffer var2, StringBuffer var3, int var4) {
+   private void appendCoordRow(StringBuffer var1, StringBuffer var2, StringBuffer var3, int var4) {
       int var5 = Math.max(Math.max(var1.length(), var2.length()), var3.length());
 
       while(var1.length() < var5) {
@@ -140,15 +140,15 @@ private void AboutDialog(StringBuffer var1, StringBuffer var2, StringBuffer var3
       var1.append("| ");
       var2.append("| ");
       var3.append("| ");
-      this.AboutDialog(this.rV, var1, var2, var3, var4);
+      this.appendCoords(this.rV, var1, var2, var3, var4);
       var1.append(' ');
       var2.append(' ');
       var3.append(' ');
-      this.AboutDialog(this.rW, var1, var2, var3, var4);
+      this.appendCoords(this.rW, var1, var2, var3, var4);
       var1.append(' ');
       var2.append(' ');
       var3.append(' ');
-      this.AboutDialog(this.rX, var1, var2, var3, var4);
+      this.appendCoords(this.rX, var1, var2, var3, var4);
       var1.append(" |");
       var2.append(" |");
       var3.append(" |");
@@ -162,7 +162,7 @@ public String toString(int var1) {
       StringBuffer var2 = new StringBuffer();
       StringBuffer var3 = new StringBuffer();
       StringBuffer var4 = new StringBuffer();
-      this.AboutDialog(var2, var3, var4, var1);
+      this.appendCoordRow(var2, var3, var4, var1);
       StringBuffer var5 = new StringBuffer();
       var5.append(var2).append("\n");
       var5.append(var3).append("\n");
@@ -171,22 +171,22 @@ public String toString(int var1) {
    }
 
    static String e(double[] var0) {
-      return AboutDialog(var0, 12);
+      return formatVector3(var0, 12);
    }
 
-   static String AboutDialog(double[] var0, int var1) {
-      return "[ " + AboutDialogCloseListener(var0[0], var1) + " , " + AboutDialogCloseListener(var0[1], var1) + " , " + AboutDialogCloseListener(var0[2], var1) + " ]";
+   static String formatVector3(double[] var0, int var1) {
+      return "[ " + formatComponentPadded(var0[0], var1) + " , " + formatComponentPadded(var0[1], var1) + " , " + formatComponentPadded(var0[2], var1) + " ]";
    }
 
    static String f(double[] var0) {
-      return AboutDialogCloseListener(var0, 12);
+      return formatVector4(var0, 12);
    }
 
-   static String AboutDialogCloseListener(double[] var0, int var1) {
-      return "[ " + AboutDialogCloseListener(var0[0], var1) + " , " + AboutDialogCloseListener(var0[1], var1) + " , " + AboutDialogCloseListener(var0[2], var1) + " , " + AboutDialogCloseListener(var0[3], var1) + " ]";
+   static String formatVector4(double[] var0, int var1) {
+      return "[ " + formatComponentPadded(var0[0], var1) + " , " + formatComponentPadded(var0[1], var1) + " , " + formatComponentPadded(var0[2], var1) + " , " + formatComponentPadded(var0[3], var1) + " ]";
    }
 
-   static String AboutDialog(double var0, int var2) {
+   static String formatComponent(double var0, int var2) {
       if (Double.isInfinite(var0)) {
          return "Infinite";
       } else if (Double.isNaN(var0)) {
@@ -198,7 +198,7 @@ static String AboutDialog(double var0, int var2) {
       }
    }
 
-   static String AboutDialogCloseListener(double var0, int var2) {
+   static String formatComponentPadded(double var0, int var2) {
       if (Double.isInfinite(var0)) {
          return "Infinite";
       } else if (Double.isNaN(var0)) {
diff --git a/nomanssave/DiscoveryPanel.java b/nomanssave/DiscoveryPanel.java
index f4103f4..dfab8d7 100644
--- a/nomanssave/DiscoveryPanel.java
+++ b/nomanssave/DiscoveryPanel.java
@@ -179,7 +179,7 @@ private void R() {
       }
    }
 
-   public void AboutDialog(Exosuit var1) {
+   public void updateExosuit(Exosuit var1) {
       this.cp = var1;
       this.cq = var1 == null ? null : var1.dQ();
       this.cr = var1 == null ? null : var1.dR();
@@ -223,17 +223,17 @@ public void AboutDialog(Exosuit var1) {
    }
 
    // $FF: synthetic method
-   static JsonArray AboutDialog(DiscoveryPanel var0) {
+   static JsonArray access$getData(DiscoveryPanel var0) {
       return var0.cq;
    }
 
    // $FF: synthetic method
-   static TableRowSorter AboutDialogCloseListener(DiscoveryPanel var0) {
+   static TableRowSorter access$getSorter(DiscoveryPanel var0) {
       return var0.cj;
    }
 
    // $FF: synthetic method
-   static JTable AccountPanel(DiscoveryPanel var0) {
+   static JTable access$getTable(DiscoveryPanel var0) {
       return var0.ci;
    }
 
diff --git a/nomanssave/Exosuit.java b/nomanssave/Exosuit.java
index 6281c11..ac0d02c 100644
--- a/nomanssave/Exosuit.java
+++ b/nomanssave/Exosuit.java
@@ -41,7 +41,7 @@ private Exosuit(JsonObject var1, JsonArray var2, JsonObject var3, JsonObject var
       JsonArray var7 = var1.d("KnownWordGroups");
       if (var7 == null) {
          var7 = new JsonArray();
-         var1.AboutDialogCloseListener("KnownWordGroups", (Object)var7);
+         var1.setValueByPath("KnownWordGroups", (Object)var7);
       }
 
       if (var6.size() > 0) {
@@ -67,10 +67,10 @@ private Exosuit(JsonObject var1, JsonArray var2, JsonObject var3, JsonObject var
                      Race var13 = var10.ShowErrorRunnable(var11);
                      if (var13 != null) {
                         JsonObject var14 = new JsonObject();
-                        var14.AboutDialogCloseListener("Group", (Object)var11);
+                        var14.setValueByPath("Group", (Object)var11);
                         JsonArray var15 = new JsonArray(new Object[]{Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE});
                         var15.AboutDialog(var13.ordinal(), Boolean.TRUE);
-                        var14.AboutDialogCloseListener("Races", (Object)var15);
+                        var14.setValueByPath("Races", (Object)var15);
                         var7.f(var14);
                         Logger.debug("Creating word: " + var11 + "[" + var13.ordinal() + "] = true");
                      }
@@ -131,7 +131,7 @@ public long dJ() {
    }
 
    public void e(long var1) {
-      this.oI.AboutDialogCloseListener("Units", (Object)(new Integer((int)var1)));
+      this.oI.setValueByPath("Units", (Object)(new Integer((int)var1)));
    }
 
    public long dK() {
@@ -139,7 +139,7 @@ public long dK() {
    }
 
    public void f(long var1) {
-      this.oI.AboutDialogCloseListener("Nanites", (Object)(new Integer((int)var1)));
+      this.oI.setValueByPath("Nanites", (Object)(new Integer((int)var1)));
    }
 
    public long dL() {
@@ -147,7 +147,7 @@ public long dL() {
    }
 
    public void g(long var1) {
-      this.oI.AboutDialogCloseListener("Specials", (Object)(new Integer((int)var1)));
+      this.oI.setValueByPath("Specials", (Object)(new Integer((int)var1)));
    }
 
    public int dM() {
@@ -155,7 +155,7 @@ public int dM() {
    }
 
    public void aB(int var1) {
-      this.oI.AboutDialogCloseListener("Health", (Object)(new Integer(var1)));
+      this.oI.setValueByPath("Health", (Object)(new Integer(var1)));
    }
 
    public int ShipsPanel() {
@@ -163,7 +163,7 @@ public int ShipsPanel() {
    }
 
    public void aC(int var1) {
-      this.oI.AboutDialogCloseListener("Shield", (Object)(new Integer(var1)));
+      this.oI.setValueByPath("Shield", (Object)(new Integer(var1)));
    }
 
    public int dO() {
@@ -171,7 +171,7 @@ public int dO() {
    }
 
    public void aD(int var1) {
-      this.oI.AboutDialogCloseListener("Energy", (Object)(new Integer(var1)));
+      this.oI.setValueByPath("Energy", (Object)(new Integer(var1)));
    }
 
    public List cC() {
@@ -183,7 +183,7 @@ public int dP() {
    }
 
    public void aE(int var1) {
-      this.oI.AboutDialogCloseListener("KnownPortalRunes", (Object)(new Integer(var1)));
+      this.oI.setValueByPath("KnownPortalRunes", (Object)(new Integer(var1)));
    }
 
    public JsonArray dQ() {
@@ -213,7 +213,7 @@ public int bx() {
       return var1;
    }
 
-   public int AboutDialogCloseListener(Race var1) {
+   public int countKnownWords(Race var1) {
       int var2 = 0;
 
       for(int var4 = 0; var4 < this.rc.size(); ++var4) {
@@ -226,7 +226,7 @@ public int AboutDialogCloseListener(Race var1) {
       return var2;
    }
 
-   public gA AboutDialog(AlienWord var1) {
+   public gA getWordEntry(AlienWord var1) {
       return new gA(this, var1, (gA)null);
    }
 
@@ -241,7 +241,7 @@ private boolean d(String var1, int var2) {
       return false;
    }
 
-   private void AboutDialog(String var1, int var2, boolean var3) {
+   private void setStatData(String var1, int var2, boolean var3) {
       JsonObject var4;
       for(int var5 = 0; var5 < this.rc.size(); ++var5) {
          var4 = this.rc.V(var5);
@@ -271,7 +271,7 @@ private void AboutDialog(String var1, int var2, boolean var3) {
       if (var3) {
          Logger.debug("Creating word: " + var1 + "[" + var2 + "] = " + var3);
          var4 = new JsonObject();
-         var4.AboutDialogCloseListener("Group", (Object)var1);
+         var4.setValueByPath("Group", (Object)var1);
          JsonArray var8 = new JsonArray();
 
          while(var8.size() < Race.values().length) {
@@ -279,7 +279,7 @@ private void AboutDialog(String var1, int var2, boolean var3) {
          }
 
          var8.AboutDialog(var2, new Boolean(var3));
-         var4.AboutDialogCloseListener("Races", (Object)var8);
+         var4.setValueByPath("Races", (Object)var8);
          this.rc.f(var4);
       }
 
@@ -292,13 +292,13 @@ public double dT() {
    public void g(double var1) {
       long var3 = Math.round(var1 * 900.0D);
       if (var3 >= 0L && var3 <= 2147483647L) {
-         this.oI.AboutDialogCloseListener("HazardTimeAlive", (Object)(new Integer((int)var3)));
+         this.oI.setValueByPath("HazardTimeAlive", (Object)(new Integer((int)var3)));
       } else {
          throw new RuntimeException("Stat value out of range");
       }
    }
 
-   public int AboutDialog(gs var1) {
+   public int getStat(gs var1) {
       for(int var3 = 0; var3 < this.rb.size(); ++var3) {
          JsonObject var2 = this.rb.V(var3);
          if (var2.getValueAsString("Id").equals(var1.id)) {
@@ -309,7 +309,7 @@ public int AboutDialog(gs var1) {
       return 0;
    }
 
-   public void AboutDialog(gs var1, int var2) {
+   public void setStat(gs var1, int var2) {
       if (var2 < 0) {
          throw new RuntimeException("Stat value out of range");
       } else {
@@ -317,23 +317,23 @@ public void AboutDialog(gs var1, int var2) {
          for(int var4 = 0; var4 < this.rb.size(); ++var4) {
             var3 = this.rb.V(var4);
             if (var3.getValueAsString("Id").equals(var1.id)) {
-               var3.AboutDialogCloseListener("Value.IntValue", (Object)(new Integer(var2)));
+               var3.setValueByPath("Value.IntValue", (Object)(new Integer(var2)));
                return;
             }
          }
 
          var3 = new JsonObject();
-         var3.AboutDialogCloseListener("Id", (Object)var1.id);
+         var3.setValueByPath("Id", (Object)var1.id);
          JsonObject var5 = new JsonObject();
-         var5.AboutDialogCloseListener("IntValue", (Object)(new Integer(var2)));
-         var5.AboutDialogCloseListener("FloatValue", (Object)(new Double(0.0D)));
-         var5.AboutDialogCloseListener("Denominator", (Object)(new Double(0.0D)));
-         var3.AboutDialogCloseListener("Value", (Object)var5);
+         var5.setValueByPath("IntValue", (Object)(new Integer(var2)));
+         var5.setValueByPath("FloatValue", (Object)(new Double(0.0D)));
+         var5.setValueByPath("Denominator", (Object)(new Double(0.0D)));
+         var3.setValueByPath("Value", (Object)var5);
          this.rb.f(var3);
       }
    }
 
-   public double AboutDialogCloseListener(gs var1) {
+   public double getStatDouble(gs var1) {
       for(int var3 = 0; var3 < this.rb.size(); ++var3) {
          JsonObject var2 = this.rb.V(var3);
          if (var2.getValueAsString("Id").equals(var1.id)) {
@@ -344,7 +344,7 @@ public double AboutDialogCloseListener(gs var1) {
       return 0.0D;
    }
 
-   public void AboutDialog(gs var1, double var2) {
+   public void setStatDouble(gs var1, double var2) {
       if (var2 < 0.0D) {
          throw new RuntimeException("Stat value out of range");
       } else {
@@ -352,29 +352,29 @@ public void AboutDialog(gs var1, double var2) {
          for(int var5 = 0; var5 < this.rb.size(); ++var5) {
             var4 = this.rb.V(var5);
             if (var4.getValueAsString("Id").equals(var1.id)) {
-               var4.AboutDialogCloseListener("Value.FloatValue", (Object)(new Double(var2)));
+               var4.setValueByPath("Value.FloatValue", (Object)(new Double(var2)));
                return;
             }
          }
 
          var4 = new JsonObject();
-         var4.AboutDialogCloseListener("Id", (Object)var1.id);
+         var4.setValueByPath("Id", (Object)var1.id);
          JsonObject var6 = new JsonObject();
-         var6.AboutDialogCloseListener("IntValue", (Object)(new Integer(0)));
-         var6.AboutDialogCloseListener("FloatValue", (Object)(new Double(var2)));
-         var6.AboutDialogCloseListener("Denominator", (Object)(new Double(0.0D)));
-         var4.AboutDialogCloseListener("Value", (Object)var6);
+         var6.setValueByPath("IntValue", (Object)(new Integer(0)));
+         var6.setValueByPath("FloatValue", (Object)(new Double(var2)));
+         var6.setValueByPath("Denominator", (Object)(new Double(0.0D)));
+         var4.setValueByPath("Value", (Object)var6);
          this.rb.f(var4);
       }
    }
 
    // $FF: synthetic method
-   static boolean AboutDialog(Exosuit var0, String var1, int var2) {
+   static boolean access$checkStatKey(Exosuit var0, String var1, int var2) {
       return var0.d(var1, var2);
    }
 
    // $FF: synthetic method
-   static void AboutDialog(Exosuit var0, String var1, int var2, boolean var3) {
-      var0.AboutDialog(var1, var2, var3);
+   static void access$setStatData(Exosuit var0, String var1, int var2, boolean var3) {
+      var0.setStatData(var1, var2, var3);
    }
 }
diff --git a/nomanssave/ExosuitPanel.java b/nomanssave/ExosuitPanel.java
index 85d2a63..a2a1dc6 100644
--- a/nomanssave/ExosuitPanel.java
+++ b/nomanssave/ExosuitPanel.java
@@ -21,19 +21,19 @@ public class ExosuitPanel extends SplitFormPanel {
    ExosuitPanel(Application var1) {
       this.k("Main Stats");
       this.de = new aK(this);
-      this.AboutDialog("Health", this.de);
+      this.addRow("Health", this.de);
       this.df = new aL(this);
-      this.AboutDialog("Shield", this.df);
+      this.addRow("Shield", this.df);
       this.dg = new aM(this);
-      this.AboutDialog("Energy", this.dg);
+      this.addRow("Energy", this.dg);
       this.db = new aN(this, var1);
-      this.AboutDialog("Units", this.db);
+      this.addRow("Units", this.db);
       this.dc = new aO(this);
-      this.AboutDialog("Nanites", this.dc);
+      this.addRow("Nanites", this.dc);
       this.dd = new aP(this);
-      this.AboutDialog("Quicksilver", this.dd);
+      this.addRow("Quicksilver", this.dd);
       this.dh = new InventoryPanel(var1);
-      this.AboutDialogCloseListener(this.dh);
+      this.setRightComponent(this.dh);
    }
 
    void AppStartupRunnable() {
@@ -52,15 +52,15 @@ void ShowWarningRunnable() {
       this.dh.ShowWarningRunnable();
    }
 
-   void AboutDialog(Inventory var1) {
-      this.dh.AboutDialog(var1);
+   void updateInventory(Inventory var1) {
+      this.dh.updateInventory(var1);
    }
 
    Exosuit CompanionsPanel() {
       return this.di;
    }
 
-   void AboutDialog(Exosuit var1) {
+   void updateExosuit(Exosuit var1) {
       if (var1 == null) {
          this.di = null;
          this.db.setText("");
@@ -69,7 +69,7 @@ void AboutDialog(Exosuit var1) {
          this.de.setText("");
          this.df.setText("");
          this.dg.setText("");
-         this.dh.AboutDialog(Collections.emptyList());
+         this.dh.updateInventory(Collections.emptyList());
       } else {
          this.di = var1;
          this.db.setText(Long.toString(var1.dJ()));
@@ -78,13 +78,13 @@ void AboutDialog(Exosuit var1) {
          this.de.setText(Integer.toString(var1.dM()));
          this.df.setText(Integer.toString(var1.ShipsPanel()));
          this.dg.setText(Integer.toString(var1.dO()));
-         this.dh.AboutDialog(var1.cC());
+         this.dh.updateInventory(var1.cC());
       }
 
    }
 
    // $FF: synthetic method
-   static Exosuit AboutDialog(ExosuitPanel var0) {
+   static Exosuit access$getExosuit(ExosuitPanel var0) {
       return var0.di;
    }
 }
diff --git a/nomanssave/FileComboBoxModel.java b/nomanssave/FileComboBoxModel.java
index 6ec71d2..8d424b6 100644
--- a/nomanssave/FileComboBoxModel.java
+++ b/nomanssave/FileComboBoxModel.java
@@ -54,11 +54,11 @@ public void setSelectedItem(Object var1) {
          if (var4 < Application.f(this.aZ).length) {
             SaveFile[] var7 = new SaveFile[var4];
             System.arraycopy(Application.f(this.aZ), 0, var7, 0, var4);
-            Application.AboutDialog(this.aZ, var7);
+            Application.access$setSaveFiles(this.aZ, var7);
          }
       }
 
-      Application.AboutDialogCloseListener(this.aZ, var2);
+      Application.access$selectFile(this.aZ, var2);
    }
 
    public Object getSelectedItem() {
diff --git a/nomanssave/FileWatcher.java b/nomanssave/FileWatcher.java
index b866b48..fe4a6d4 100644
--- a/nomanssave/FileWatcher.java
+++ b/nomanssave/FileWatcher.java
@@ -7,29 +7,29 @@ public class FileWatcher {
    private static final Object lock = new Object();
    private static FileWatcherThread lj;
 
-   public static void AboutDialog(SaveLocation var0, File var1) {
+   public static void register(SaveLocation var0, File var1) {
       synchronized(lock) {
          try {
             if (lj == null) {
                lj = new FileWatcherThread();
             }
 
-            lj.AboutDialog(var0, var1);
+            lj.fileChanged(var0, var1);
          } catch (IOException var4) {
-            Logger.AboutDialog("Unable to register storage", var4);
+            Logger.error("Unable to register storage", var4);
          }
 
       }
    }
 
-   public static void AboutDialogCloseListener(SaveLocation var0) {
+   public static void unregister(SaveLocation var0) {
       synchronized(lock) {
          try {
             if (lj != null) {
-               lj.AboutDialogCloseListener(var0);
+               lj.unregister(var0);
             }
          } catch (IOException var3) {
-            Logger.AboutDialog("Unable to unregister storage", var3);
+            Logger.error("Unable to unregister storage", var3);
          }
 
       }
diff --git a/nomanssave/FileWatcherThread.java b/nomanssave/FileWatcherThread.java
index 5f6060b..dd0933a 100644
--- a/nomanssave/FileWatcherThread.java
+++ b/nomanssave/FileWatcherThread.java
@@ -26,12 +26,12 @@ class FileWatcherThread extends Thread {
       this.start();
    }
 
-   void AboutDialog(SaveLocation var1, File var2) {
+   void fileChanged(SaveLocation var1, File var2) {
       WatchKey var3 = var2.toPath().register(this.lk, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_DELETE, StandardWatchEventKinds.ENTRY_MODIFY);
       this.ll.put(var1, var3);
    }
 
-   void AboutDialogCloseListener(SaveLocation var1) {
+   void unregister(SaveLocation var1) {
       WatchKey var2 = (WatchKey)this.ll.remove(var1);
       if (var2 != null) {
          var2.cancel();
diff --git a/nomanssave/FormPanel.java b/nomanssave/FormPanel.java
index a3cd11c..0d1bdf2 100644
--- a/nomanssave/FormPanel.java
+++ b/nomanssave/FormPanel.java
@@ -36,10 +36,10 @@ public class FormPanel extends JPanel {
    }
 
    void k(String var1) {
-      this.AboutDialog(var1, (ImageIcon)null);
+      this.addRow(var1, (ImageIcon)null);
    }
 
-   void AboutDialog(String var1, ImageIcon var2) {
+   void addRow(String var1, ImageIcon var2) {
       int var3;
       if (this.dA.getRowCount() == 1) {
          this.dA.appendRow(FormFactory.DEFAULT_ROWSPEC);
@@ -86,19 +86,19 @@ void Y() {
       this.dA.appendRow(FormFactory.LINE_GAP_ROWSPEC);
    }
 
-   void AboutDialog(String var1, JComponent var2) {
-      this.AboutDialog(var1, false, var2, 1);
+   void addRow(String var1, JComponent var2) {
+      this.addRow(var1, false, var2, 1);
    }
 
-   void AboutDialog(String var1, JComponent var2, int var3) {
-      this.AboutDialog(var1, false, var2, var3);
+   void addRow(String var1, JComponent var2, int var3) {
+      this.addRow(var1, false, var2, var3);
    }
 
-   void AboutDialog(String var1, boolean var2, JComponent var3) {
-      this.AboutDialog(var1, var2, var3, 1);
+   void addRow(String var1, boolean var2, JComponent var3) {
+      this.addRow(var1, var2, var3, 1);
    }
 
-   void AboutDialog(String var1, boolean var2, JComponent var3, int var4) {
+   void addRow(String var1, boolean var2, JComponent var3, int var4) {
       var4 = var4 * 2 - 1;
       this.dA.appendRow(FormFactory.DEFAULT_ROWSPEC);
       this.dA.appendRow(FormFactory.LINE_GAP_ROWSPEC);
@@ -115,7 +115,7 @@ void AboutDialog(String var1, boolean var2, JComponent var3, int var4) {
       this.add(var3, "4, " + var5 + ", " + var4 + ", 1, fill, default");
    }
 
-   void AboutDialog(String var1, ValidatedTextField var2) {
+   void addRow(String var1, ValidatedTextField var2) {
       JPanel var3 = new JPanel();
       var3.setLayout(new BorderLayout(0, 0));
       JPanel var4 = new JPanel();
@@ -127,10 +127,10 @@ void AboutDialog(String var1, ValidatedTextField var2) {
       var4.add(var5);
       var3.add(var2, "Center");
       var3.add(var4, "South");
-      this.AboutDialog(var1, (JComponent)var3);
+      this.addRow(var1, (JComponent)var3);
    }
 
-   void AboutDialog(JComponent var1) {
+   void addRow(JComponent var1) {
       this.dA.appendRow(FormFactory.DEFAULT_ROWSPEC);
       this.dA.appendRow(FormFactory.LINE_GAP_ROWSPEC);
       int var2 = this.dA.getColumnCount() - 2;
diff --git a/nomanssave/Freighter.java b/nomanssave/Freighter.java
index 12eac92..754c10d 100644
--- a/nomanssave/Freighter.java
+++ b/nomanssave/Freighter.java
@@ -18,7 +18,7 @@ private static boolean isEmpty(String var0) {
       return var0 == null || var0.length() == 0;
    }
 
-   private static Function AboutDialog(Freighter var0, String var1) {
+   private static Function buildFieldAccessor(Freighter var0, String var1) {
       return (var1x) -> {
          return new String[]{"Freighter", var1};
       };
@@ -56,13 +56,13 @@ private Freighter(JsonObject var1, JsonObject var2, JsonObject var3, JsonObject
       }
 
       ArrayList var14 = new ArrayList();
-      var14.add(new Inventory(AboutDialog(this, var5), var2, var19, var10, var11, false, true));
+      var14.add(new Inventory(buildFieldAccessor(this, var5), var2, var19, var10, var11, false, true));
       if (var3 != null) {
-         var14.add(new Inventory(AboutDialog(this, "Technology"), var3, var20, var12, var13, true, true));
+         var14.add(new Inventory(buildFieldAccessor(this, "Technology"), var3, var20, var12, var13, true, true));
       }
 
       if (var4 != null) {
-         var14.add(new Inventory(AboutDialog(this, var6), var4, var9, 8, 6, false, true));
+         var14.add(new Inventory(buildFieldAccessor(this, var6), var4, var9, 8, 6, false, true));
       }
 
       this.CoordinateTransform = Collections.unmodifiableList(var14);
@@ -85,7 +85,7 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.oI.AboutDialogCloseListener("PlayerFreighterName", (Object)var1);
+      this.oI.setValueByPath("PlayerFreighterName", (Object)var1);
    }
 
    public String cT() {
@@ -93,7 +93,7 @@ public String cT() {
    }
 
    public void ag(String var1) {
-      this.oI.AboutDialogCloseListener("CurrentFreighter.Filename", (Object)var1);
+      this.oI.setValueByPath("CurrentFreighter.Filename", (Object)var1);
    }
 
    public String cU() {
@@ -110,7 +110,7 @@ public void ah(String var1) {
       JsonArray var2 = this.oI.d("CurrentFreighterHomeSystemSeed");
       if (var2 == null) {
          var2 = new JsonArray(new Object[]{Boolean.FALSE, "0x0"});
-         this.oI.AboutDialogCloseListener("CurrentFreighterHomeSystemSeed", (Object)var2);
+         this.oI.setValueByPath("CurrentFreighterHomeSystemSeed", (Object)var2);
       }
 
       var2.AboutDialog(0, Boolean.TRUE);
@@ -130,15 +130,15 @@ public String LineNumberPanel() {
    }
 
    public void aj(String var1) {
-      this.oI.AboutDialogCloseListener("FreighterInventory.Class.InventoryClass", (Object)var1);
+      this.oI.setValueByPath("FreighterInventory.Class.InventoryClass", (Object)var1);
       JsonObject var2 = this.oI.H("FreighterInventory_TechOnly.Class");
       if (var2 != null) {
-         var2.AboutDialogCloseListener("InventoryClass", (Object)var1);
+         var2.setValueByPath("InventoryClass", (Object)var1);
       }
 
       var2 = this.oI.H("FreighterInventory_Cargo.Class");
       if (var2 != null) {
-         var2.AboutDialogCloseListener("InventoryClass", (Object)var1);
+         var2.setValueByPath("InventoryClass", (Object)var1);
       }
 
    }
@@ -161,7 +161,7 @@ public double cX() {
       return this.ak("^FREI_HYPERDRIVE");
    }
 
-   public void AboutDialog(double var1) {
+   public void setHyperdriveLevel(double var1) {
       this.d("^FREI_HYPERDRIVE", var1);
    }
 
@@ -169,7 +169,7 @@ public double cY() {
       return this.ak("^FREI_FLEET");
    }
 
-   public void AboutDialogCloseListener(double var1) {
+   public void setFuelLevel(double var1) {
       this.d("^FREI_FLEET", var1);
    }
 
diff --git a/nomanssave/FreighterBase.java b/nomanssave/FreighterBase.java
index f8bb84e..769efec 100644
--- a/nomanssave/FreighterBase.java
+++ b/nomanssave/FreighterBase.java
@@ -24,7 +24,7 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.nj.AboutDialogCloseListener("Name", (Object)var1);
+      this.nj.setValueByPath("Name", (Object)var1);
    }
 
    public int cG() {
diff --git a/nomanssave/FreighterPanel.java b/nomanssave/FreighterPanel.java
index 14967ca..a2d360c 100644
--- a/nomanssave/FreighterPanel.java
+++ b/nomanssave/FreighterPanel.java
@@ -25,7 +25,7 @@ public class FreighterPanel extends SplitFormPanel {
    FreighterPanel(Application var1) {
       this.k("Freighter");
       this.dG = new be(this);
-      this.AboutDialog("Name", this.dG);
+      this.addRow("Name", this.dG);
       this.dH = new cN(FreighterType.class);
       this.dH.AboutDialog((var1x) -> {
          if (this.dO != null) {
@@ -33,7 +33,7 @@ public class FreighterPanel extends SplitFormPanel {
          }
 
       });
-      this.AboutDialog("Type", this.dH);
+      this.addRow("Type", this.dH);
       this.dI = new cN(ShipClass.class);
       this.dI.AboutDialog((var1x) -> {
          if (this.dO != null) {
@@ -41,21 +41,21 @@ public class FreighterPanel extends SplitFormPanel {
          }
 
       });
-      this.AboutDialog("Class", this.dI);
+      this.addRow("Class", this.dI);
       this.dJ = new bf(this);
-      this.AboutDialog("Home Seed", this.dJ);
+      this.addRow("Home Seed", this.dJ);
       this.dK = new bg(this);
-      this.AboutDialog("Model Seed", this.dK);
+      this.addRow("Model Seed", this.dK);
       this.k("Base Stats");
       this.dL = new bh(this);
-      this.AboutDialog("Hyperdrive", this.dL);
+      this.addRow("Hyperdrive", this.dL);
       this.dM = new bi(this);
-      this.AboutDialog("Fleet Coordination", this.dM);
+      this.addRow("Fleet Coordination", this.dM);
       this.Y();
       this.k("Base Info");
       this.bm = new JTextField();
       this.bm.setEnabled(false);
-      this.AboutDialog("Items", this.bm);
+      this.addRow("Items", this.bm);
       JPanel var2 = new JPanel();
       this.bn = new JButton("Backup");
       this.bn.addActionListener(new bj(this, var1));
@@ -63,9 +63,9 @@ public class FreighterPanel extends SplitFormPanel {
       this.bo = new JButton("Restore");
       this.bo.addActionListener(new bk(this, var1));
       var2.add(this.bo);
-      this.AboutDialog((JComponent)var2);
+      this.addRow((JComponent)var2);
       this.ShipsPanel = new InventoryPanel(var1);
-      this.AboutDialogCloseListener(this.ShipsPanel);
+      this.setRightComponent(this.ShipsPanel);
    }
 
    void AppStartupRunnable() {
@@ -84,15 +84,15 @@ void ShowWarningRunnable() {
       this.ShipsPanel.ShowWarningRunnable();
    }
 
-   void AboutDialog(Inventory var1) {
-      this.ShipsPanel.AboutDialog(var1);
+   void updateInventory(Inventory var1) {
+      this.ShipsPanel.updateInventory(var1);
    }
 
    Freighter Z() {
       return this.dO;
    }
 
-   void AccountPanel(Freighter var1) {
+   void updateFreighter(Freighter var1) {
       if (var1 == null) {
          this.dO = null;
          this.dG.setText("");
@@ -133,17 +133,17 @@ void AccountPanel(Freighter var1) {
    }
 
    // $FF: synthetic method
-   static Freighter AboutDialog(FreighterPanel var0) {
+   static Freighter access$getFreighter(FreighterPanel var0) {
       return var0.dO;
    }
 
    // $FF: synthetic method
-   static ValidatedTextField AboutDialogCloseListener(FreighterPanel var0) {
+   static ValidatedTextField access$getNameField(FreighterPanel var0) {
       return var0.dG;
    }
 
    // $FF: synthetic method
-   static ValidatedTextField AccountPanel(FreighterPanel var0) {
+   static ValidatedTextField access$getSeedField(FreighterPanel var0) {
       return var0.dJ;
    }
 }
diff --git a/nomanssave/Frigate.java b/nomanssave/Frigate.java
index f4e2146..5ae6ac7 100644
--- a/nomanssave/Frigate.java
+++ b/nomanssave/Frigate.java
@@ -41,15 +41,15 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.oR.AboutDialogCloseListener("CustomName", (Object)var1);
+      this.oR.setValueByPath("CustomName", (Object)var1);
    }
 
    public FrigateClass da() {
       return FrigateClass.an(this.oR.getValueAsString("FrigateClass.FrigateClass"));
    }
 
-   public void AccountPanel(FrigateClass var1) {
-      this.oR.AboutDialogCloseListener("FrigateClass.FrigateClass", (Object)var1.toString());
+   public void setFrigateClass(FrigateClass var1) {
+      this.oR.setValueByPath("FrigateClass.FrigateClass", (Object)var1.toString());
    }
 
    public String LineNumberPanel() {
@@ -96,7 +96,7 @@ public String db() {
    }
 
    public void am(String var1) {
-      this.oR.AboutDialogCloseListener("Race.AlienRace", (Object)var1);
+      this.oR.setValueByPath("Race.AlienRace", (Object)var1);
    }
 
    public int aq(int var1) {
@@ -124,7 +124,7 @@ public er ar(int var1) {
       }
    }
 
-   public void AboutDialog(int var1, er var2) {
+   public void setStatUpgrade(int var1, er var2) {
       JsonArray var3 = this.oR.d("TraitIDs");
       if (var1 < var3.size()) {
          var3.AboutDialog(var1, var2 == null ? "^" : var2.getID());
@@ -137,7 +137,7 @@ public int dc() {
    }
 
    public void as(int var1) {
-      this.oR.AboutDialogCloseListener("TotalNumberOfExpeditions", (Object)(new Integer(var1)));
+      this.oR.setValueByPath("TotalNumberOfExpeditions", (Object)(new Integer(var1)));
    }
 
    public int dd() {
@@ -145,7 +145,7 @@ public int dd() {
    }
 
    public void at(int var1) {
-      this.oR.AboutDialogCloseListener("TotalNumberOfSuccessfulEvents", (Object)(new Integer(var1)));
+      this.oR.setValueByPath("TotalNumberOfSuccessfulEvents", (Object)(new Integer(var1)));
    }
 
    public int de() {
@@ -153,7 +153,7 @@ public int de() {
    }
 
    public void au(int var1) {
-      this.oR.AboutDialogCloseListener("TotalNumberOfFailedEvents", (Object)(new Integer(var1)));
+      this.oR.setValueByPath("TotalNumberOfFailedEvents", (Object)(new Integer(var1)));
    }
 
    public int df() {
@@ -161,7 +161,7 @@ public int df() {
    }
 
    public void av(int var1) {
-      this.oR.AboutDialogCloseListener("NumberOfTimesDamaged", (Object)(new Integer(var1)));
+      this.oR.setValueByPath("NumberOfTimesDamaged", (Object)(new Integer(var1)));
    }
 
    public int dg() {
@@ -169,7 +169,7 @@ public int dg() {
    }
 
    public void aw(int var1) {
-      this.oR.AboutDialogCloseListener("RepairsMade", (Object)(new Integer(var1)));
+      this.oR.setValueByPath("RepairsMade", (Object)(new Integer(var1)));
    }
 
    public int dh() {
@@ -177,7 +177,7 @@ public int dh() {
    }
 
    public void ax(int var1) {
-      this.oR.AboutDialogCloseListener("DamageTaken", (Object)(new Integer(var1)));
+      this.oR.setValueByPath("DamageTaken", (Object)(new Integer(var1)));
    }
 
    public String toString() {
diff --git a/nomanssave/FrigatesPanel.java b/nomanssave/FrigatesPanel.java
index ea95719..11fe43f 100644
--- a/nomanssave/FrigatesPanel.java
+++ b/nomanssave/FrigatesPanel.java
@@ -151,17 +151,17 @@ public class FrigatesPanel extends JPanel implements eo {
       this.SquadronPanel.AboutDialog("Failed", (JComponent)this.ej);
       this.ek = new bq(this);
       this.SquadronPanel.AboutDialog("Damaged", (JComponent)this.ek);
-      nomanssave.en.AboutDialog(this);
+      nomanssave.en.addListener(this);
    }
 
-   public void AboutDialog(boolean var1) {
+   public void setEditable(boolean var1) {
       if (this.dR.getSelectedRow() >= 0) {
          this.dS.setEnabled(this.VehiclesPanel.length < 30 || nomanssave.en.aS());
       }
 
    }
 
-   void AboutDialog(Frigate[] var1) {
+   void updateFrigates(Frigate[] var1) {
       this.VehiclesPanel = var1;
       this.en = null;
       this.eo = null;
@@ -174,17 +174,17 @@ void AboutDialog(Frigate[] var1) {
    }
 
    // $FF: synthetic method
-   static er[] AboutDialog(FrigatesPanel var0) {
+   static er[] access$getStatLabels(FrigatesPanel var0) {
       return var0.en;
    }
 
    // $FF: synthetic method
-   static int AboutDialogCloseListener(FrigatesPanel var0) {
+   static int access$getSelectedIndex(FrigatesPanel var0) {
       return var0.eq;
    }
 
    // $FF: synthetic method
-   static Frigate[] AccountPanel(FrigatesPanel var0) {
+   static Frigate[] access$getFrigates(FrigatesPanel var0) {
       return var0.VehiclesPanel;
    }
 
@@ -204,7 +204,7 @@ static er[] f(FrigatesPanel var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(FrigatesPanel var0, Frigate[] var1) {
+   static void access$setFrigates(FrigatesPanel var0, Frigate[] var1) {
       var0.VehiclesPanel = var1;
    }
 
@@ -214,17 +214,17 @@ static JButton g(FrigatesPanel var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(FrigatesPanel var0, int var1) {
+   static void access$setSelectedIndex(FrigatesPanel var0, int var1) {
       var0.eq = var1;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(FrigatesPanel var0, er[] var1) {
+   static void access$setStatLabels(FrigatesPanel var0, er[] var1) {
       var0.en = var1;
    }
 
    // $FF: synthetic method
-   static void AboutDialogCloseListener(FrigatesPanel var0, er[] var1) {
+   static void access$initStatLabels(FrigatesPanel var0, er[] var1) {
       var0.eo = var1;
    }
 
diff --git a/nomanssave/GalacticAddress.java b/nomanssave/GalacticAddress.java
index c774289..af8d2ba 100644
--- a/nomanssave/GalacticAddress.java
+++ b/nomanssave/GalacticAddress.java
@@ -32,7 +32,7 @@ private static long aE(String var0) {
       return var1;
    }
 
-   private static int AboutDialog(long var0, int var2) {
+   private static int extractSignedBits(long var0, int var2) {
       int var3 = -1 >>> 32 - var2;
       int var4 = Integer.MIN_VALUE >>> 32 - var2;
       int var5 = (int)(var0 & (long)var3);
@@ -43,7 +43,7 @@ private static int AboutDialog(long var0, int var2) {
       return var5;
    }
 
-   private static int AboutDialogCloseListener(long var0, int var2) {
+   private static int extractUnsignedBits(long var0, int var2) {
       int var3 = -1 >>> 32 - var2;
       return (int)(var0 & (long)var3);
    }
@@ -75,10 +75,10 @@ public static GalacticAddress e(String var0, int var1) {
          }
       } else if (sO.matcher(var0).matches()) {
          var3 = aE(var0);
-         int var5 = AboutDialogCloseListener(var3 >> 44, 4);
-         int var6 = AboutDialogCloseListener(var3 >> 32, 12);
-         int var7 = AboutDialog(var3 >> 24, 8);
-         int var8 = AboutDialog(var3 >> 12, 12);
+         int var5 = extractUnsignedBits(var3 >> 44, 4);
+         int var6 = extractUnsignedBits(var3 >> 32, 12);
+         int var7 = extractSignedBits(var3 >> 24, 8);
+         int var8 = extractSignedBits(var3 >> 12, 12);
          int var9 = AboutDialog(var3, 12);
          return new GalacticAddress(var5, var6, var1, var7, var8, var9);
       } else {
@@ -123,12 +123,12 @@ private GalacticAddress(JsonObject var1) {
    }
 
    public GalacticAddress(long var1) {
-      this.sQ = AboutDialogCloseListener(var1 >> 52, 12);
-      this.sR = AboutDialogCloseListener(var1 >> 40, 12);
-      this.sS = AboutDialogCloseListener(var1 >> 32, 8);
-      this.sT = AboutDialog(var1 >> 24, 8);
-      this.sU = AboutDialog(var1 >> 12, 12);
-      this.sV = AboutDialog(var1 >> 0, 12);
+      this.sQ = extractUnsignedBits(var1 >> 52, 12);
+      this.sR = extractUnsignedBits(var1 >> 40, 12);
+      this.sS = extractUnsignedBits(var1 >> 32, 8);
+      this.sT = extractSignedBits(var1 >> 24, 8);
+      this.sU = extractSignedBits(var1 >> 12, 12);
+      this.sV = extractSignedBits(var1 >> 0, 12);
    }
 
    private GalacticAddress(int var1, int var2, int var3, int var4, int var5, int var6) {
diff --git a/nomanssave/InMemorySaveFile.java b/nomanssave/InMemorySaveFile.java
index ea6366a..4ef5973 100644
--- a/nomanssave/InMemorySaveFile.java
+++ b/nomanssave/InMemorySaveFile.java
@@ -34,7 +34,7 @@ public JsonObject M() {
       return this.bf;
    }
 
-   public String AboutDialogCloseListener(JsonObject var1) {
+   public String generateFilename(JsonObject var1) {
       throw new IOException("Save not supported!");
    }
 
diff --git a/nomanssave/Inventory.java b/nomanssave/Inventory.java
index 5b89fbe..b2c5f28 100644
--- a/nomanssave/Inventory.java
+++ b/nomanssave/Inventory.java
@@ -47,7 +47,7 @@ public class Inventory {
    // $FF: synthetic field
    private static int[] qC;
 
-   public static int AboutDialog(ex var0) {
+   public static int getSlotIndex(ex var0) {
       switch(dw()[var0.ordinal()]) {
       case 18:
          return 3584;
@@ -104,7 +104,7 @@ public static int AboutDialog(ex var0) {
       this.qx = var9;
       this.width = var2.J("Width");
       this.height = var2.J("Height");
-      ew var10 = eu.AboutDialogCloseListener(Application.getInstance().FileComboBoxModel(), var2.getValueAsString("StackSizeGroup.InventoryStackSizeGroup"));
+      ew var10 = eu.findByName(Application.getInstance().FileComboBoxModel(), var2.getValueAsString("StackSizeGroup.InventoryStackSizeGroup"));
       if (var10 != null) {
          this.MilestonesPanel = var10.aX();
          this.bF = var10.aY();
@@ -186,7 +186,7 @@ public void setName(String var1) {
          var1 = "";
       }
 
-      this.qt.AboutDialogCloseListener("Name", (Object)var1);
+      this.qt.setValueByPath("Name", (Object)var1);
    }
 
    public int MultitoolPanel() {
@@ -251,7 +251,7 @@ void d(String var1, double var2) {
          for(int var6 = 0; var6 < var4.size(); ++var6) {
             JsonObject var7 = var4.V(var6);
             if (var7.getValueAsString("BaseStatID").equals(var1)) {
-               var7.AboutDialogCloseListener("Value", (Object)var2);
+               var7.setValueByPath("Value", (Object)var2);
                var5 = true;
                break;
             }
@@ -259,8 +259,8 @@ void d(String var1, double var2) {
 
          if (!var5) {
             JsonObject var8 = new JsonObject();
-            var8.AboutDialogCloseListener("BaseStatID", (Object)var1);
-            var8.AboutDialogCloseListener("Value", (Object)var2);
+            var8.setValueByPath("BaseStatID", (Object)var1);
+            var8.setValueByPath("Value", (Object)var2);
             var4.f(var8);
             var5 = true;
          }
@@ -289,7 +289,7 @@ public Dimension getSize() {
       return new Dimension(this.width, this.height);
    }
 
-   public boolean AboutDialog(Dimension var1) {
+   public boolean resize(Dimension var1) {
       int var2 = 1;
       int var3 = 1;
 
@@ -347,13 +347,13 @@ public boolean AboutDialog(Dimension var1) {
          boolean var8 = false;
          if (this.width != var1.width) {
             this.width = var1.width;
-            this.qt.AboutDialogCloseListener("Width", (Object)(new Integer(this.width)));
+            this.qt.setValueByPath("Width", (Object)(new Integer(this.width)));
             var8 = true;
          }
 
          if (this.height != var1.height) {
             this.height = var1.height;
-            this.qt.AboutDialogCloseListener("Height", (Object)(new Integer(this.height)));
+            this.qt.setValueByPath("Height", (Object)(new Integer(this.height)));
             var8 = true;
          }
 
@@ -365,13 +365,13 @@ public boolean dl() {
       boolean var1 = false;
       if (this.width < this.qz[0].length) {
          this.width = this.qz[0].length;
-         this.qt.AboutDialogCloseListener("Width", (Object)(new Integer(this.width)));
+         this.qt.setValueByPath("Width", (Object)(new Integer(this.width)));
          var1 = true;
       }
 
       if (this.height < this.qz.length) {
          this.height = this.qz.length;
-         this.qt.AboutDialogCloseListener("Height", (Object)(new Integer(this.height)));
+         this.qt.setValueByPath("Height", (Object)(new Integer(this.height)));
          var1 = true;
       }
 
@@ -398,7 +398,7 @@ public Dimension dn() {
       return new Dimension(this.qz[0].length, this.qz.length);
    }
 
-   public void AboutDialog(int var1, int var2, int var3, int var4) {
+   public void setSlot(int var1, int var2, int var3, int var4) {
       if (!this.qz[var2][var1]) {
          throw new RuntimeException("Old slot not enabled");
       } else if (!this.qz[var4][var3]) {
@@ -413,8 +413,8 @@ public void AboutDialog(int var1, int var2, int var3, int var4) {
             this.qy[var4][var3] = null;
          } else {
             JsonObject var6 = this.qy[var2][var1].MilestonesPanel();
-            var6.AboutDialogCloseListener("Index.X", (Object)var3);
-            var6.AboutDialogCloseListener("Index.Y", (Object)var4);
+            var6.setValueByPath("Index.X", (Object)var3);
+            var6.setValueByPath("Index.Y", (Object)var4);
             var5.f(var6);
             this.qy[var4][var3] = var6;
          }
@@ -422,7 +422,7 @@ public void AboutDialog(int var1, int var2, int var3, int var4) {
       }
    }
 
-   public void AboutDialogCloseListener(int var1, int var2, int var3, int var4) {
+   public void clearSlot(int var1, int var2, int var3, int var4) {
       if (!this.qz[var2][var1]) {
          throw new RuntimeException("Old slot not enabled");
       } else if (!this.qz[var4][var3]) {
@@ -434,21 +434,21 @@ public void AboutDialogCloseListener(int var1, int var2, int var3, int var4) {
             int var7 = var6.J("MaxAmount");
             int var8 = var5.J("Amount") + var6.J("Amount");
             if (var8 <= var7) {
-               var6.AboutDialogCloseListener("Amount", (Object)var8);
+               var6.setValueByPath("Amount", (Object)var8);
                this.g(var1, var2);
             } else {
-               var6.AboutDialogCloseListener("Amount", (Object)var7);
-               var5.AboutDialogCloseListener("Amount", (Object)(var8 - var7));
+               var6.setValueByPath("Amount", (Object)var7);
+               var5.setValueByPath("Amount", (Object)(var8 - var7));
             }
 
          } else {
             if (var5 != null) {
-               var5.AboutDialogCloseListener("Index", (new fa()).d("X", var3).d("Y", var4).bH());
+               var5.setValueByPath("Index", (new fa()).d("X", var3).d("Y", var4).bH());
             }
 
             this.qy[var4][var3] = var5;
             if (var6 != null) {
-               var6.AboutDialogCloseListener("Index", (new fa()).d("X", var1).d("Y", var2).bH());
+               var6.setValueByPath("Index", (new fa()).d("X", var1).d("Y", var2).bH());
             }
 
             this.qy[var2][var1] = var6;
@@ -456,7 +456,7 @@ public void AboutDialogCloseListener(int var1, int var2, int var3, int var4) {
       }
    }
 
-   public void AccountPanel(int var1, int var2, int var3, int var4) {
+   public void enableSlot(int var1, int var2, int var3, int var4) {
       if (!this.qz[var2][var1]) {
          throw new RuntimeException("Old slot not enabled");
       } else if (!this.qz[var4][var3]) {
@@ -465,12 +465,12 @@ public void AccountPanel(int var1, int var2, int var3, int var4) {
          JsonObject var5 = this.qy[var2][var1];
          JsonObject var6 = this.qy[var4][var3];
          if (var5 != null) {
-            var5.AboutDialogCloseListener("Index", (new fa()).d("X", var3).d("Y", var4).bH());
+            var5.setValueByPath("Index", (new fa()).d("X", var3).d("Y", var4).bH());
          }
 
          this.qy[var4][var3] = var5;
          if (var6 != null) {
-            var6.AboutDialogCloseListener("Index", (new fa()).d("X", var1).d("Y", var2).bH());
+            var6.setValueByPath("Index", (new fa()).d("X", var1).d("Y", var2).bH());
          }
 
          this.qy[var2][var1] = var6;
@@ -488,7 +488,7 @@ public void az(int var1) {
          JsonObject var4 = var2.V(var3);
          if (var4.getValueAsString("Type.InventoryType").equals("Technology")) {
             ItemDefinition var5 = ItemDefinition.d(var4.getValue("Id"));
-            if (var5 == null || (AboutDialog(var5.bc()) & var1) == 0) {
+            if (var5 == null || (getSlotIndex(var5.bc()) & var1) == 0) {
                int var6 = var4.J("Index.X");
                int var7 = var4.J("Index.Y");
                if (var7 < this.qy.length && var6 < this.qy[var7].length) {
@@ -520,7 +520,7 @@ public boolean g(int var1, int var2) {
       }
    }
 
-   public boolean AboutDialog(int var1, int var2, Inventory var3) {
+   public boolean moveItem(int var1, int var2, Inventory var3) {
       if (this.qy[var2][var1] == null) {
          return false;
       } else {
@@ -539,7 +539,7 @@ public boolean AboutDialog(int var1, int var2, Inventory var3) {
             for(var12 = 0; var12 < var3.qy.length; ++var12) {
                for(var13 = 0; var13 < var3.qy[var12].length; ++var13) {
                   if (var3.qy[var12][var13] == null && var3.qz[var12][var13] && !var3.l(var13, var12)) {
-                     var3.AboutDialog(var13, var12, var4, var5, var6, var11, var7, var9);
+                     var3.setSlotData(var13, var12, var4, var5, var6, var11, var7, var9);
                      var6 = 0;
                      var10 = true;
                      break;
@@ -563,7 +563,7 @@ public boolean AboutDialog(int var1, int var2, Inventory var3) {
                      if (var13 < var14) {
                         var15 = var6 > var14 - var13 ? var14 - var13 : var6;
                         Logger.info("  added to existing stack: " + var15);
-                        var3.qy[var11][var12].AboutDialogCloseListener("Amount", (Object)(new Integer(var13 + var15)));
+                        var3.qy[var11][var12].setValueByPath("Amount", (Object)(new Integer(var13 + var15)));
                         var6 -= var15;
                         var10 = true;
                         if (var6 == 0) {
@@ -604,7 +604,7 @@ public boolean AboutDialog(int var1, int var2, Inventory var3) {
                   if (var3.qy[var13][var14] == null && var3.qz[var13][var14] && !var3.l(var14, var13)) {
                      var15 = var6 > var12 ? var12 : var6;
                      Logger.info("  new stack: " + var15);
-                     var3.AboutDialog(var14, var13, var4, var5, var15, var12, var7, var9);
+                     var3.setSlotData(var14, var13, var4, var5, var15, var12, var7, var9);
                      var6 -= var15;
                      var10 = true;
                      if (var6 == 0) {
@@ -635,7 +635,7 @@ public boolean AboutDialog(int var1, int var2, Inventory var3) {
                this.qy[var2][var1] = null;
             } else {
                Logger.info("  remainder: " + var6);
-               this.qy[var2][var1].AboutDialogCloseListener("Amount", (Object)(new Integer(var6)));
+               this.qy[var2][var1].setValueByPath("Amount", (Object)(new Integer(var6)));
             }
 
             return true;
@@ -643,7 +643,7 @@ public boolean AboutDialog(int var1, int var2, Inventory var3) {
       }
    }
 
-   public int AboutDialog(ItemDefinition var1, int var2) {
+   public int addItem(ItemDefinition var1, int var2) {
       int var3;
       String var4;
       switch(dy()[var1.FormPanel().ordinal()]) {
@@ -677,7 +677,7 @@ public int AboutDialog(ItemDefinition var1, int var2) {
                   if (var7 < var8) {
                      int var9 = var2 > var8 - var7 ? var8 - var7 : var2;
                      Logger.info("  added to existing stack: " + var9);
-                     this.qy[var5][var6].AboutDialogCloseListener("Amount", (Object)(new Integer(var7 + var9)));
+                     this.qy[var5][var6].setValueByPath("Amount", (Object)(new Integer(var7 + var9)));
                      var2 -= var9;
                      if (var2 == 0) {
                         break;
@@ -700,7 +700,7 @@ public int AboutDialog(ItemDefinition var1, int var2) {
                if (this.qy[var6][var7] == null && this.qz[var6][var7] && !this.l(var7, var6)) {
                   var8 = var2 > var3 ? var3 : var2;
                   Logger.info("  new stack: " + var8);
-                  this.AboutDialog(var7, var6, var4, var10, var8, var3, 0.0D, true);
+                  this.setSlotData(var7, var6, var4, var10, var8, var3, 0.0D, true);
                   var2 -= var8;
                   if (var2 == 0) {
                      break;
@@ -717,7 +717,7 @@ public int AboutDialog(ItemDefinition var1, int var2) {
       return var2;
    }
 
-   public boolean AboutDialog(int var1, int var2, ItemDefinition var3) {
+   public boolean setItem(int var1, int var2, ItemDefinition var3) {
       if (this.qy[var2][var1] != null) {
          return false;
       } else {
@@ -751,22 +751,22 @@ public boolean AboutDialog(int var1, int var2, ItemDefinition var3) {
          }
 
          Object var7 = var3.aZ();
-         this.AboutDialog(var1, var2, var3.FormPanel().toString(), var7, var4, var5, 0.0D, true);
+         this.setSlotData(var1, var2, var3.FormPanel().toString(), var7, var4, var5, 0.0D, true);
          return true;
       }
    }
 
-   private void AboutDialog(int var1, int var2, String var3, Object var4, int var5, int var6, double var7, boolean var9) {
+   private void setSlotData(int var1, int var2, String var3, Object var4, int var5, int var6, double var7, boolean var9) {
       JsonArray var10 = this.qt.d("Slots");
       JsonObject var11 = TemplateLoader.loadTemplate("slot");
-      var11.AboutDialogCloseListener("Type.InventoryType", (Object)var3);
-      var11.AboutDialogCloseListener("Id", var4);
-      var11.AboutDialogCloseListener("Amount", (Object)(new Integer(var5)));
-      var11.AboutDialogCloseListener("MaxAmount", (Object)(new Integer(var6)));
-      var11.AboutDialogCloseListener("DamageFactor", (Object)(new Double(var7)));
-      var11.AboutDialogCloseListener("FullyInstalled", (Object)(new Boolean(var9)));
-      var11.AboutDialogCloseListener("Index.X", (Object)var1);
-      var11.AboutDialogCloseListener("Index.Y", (Object)var2);
+      var11.setValueByPath("Type.InventoryType", (Object)var3);
+      var11.setValueByPath("Id", var4);
+      var11.setValueByPath("Amount", (Object)(new Integer(var5)));
+      var11.setValueByPath("MaxAmount", (Object)(new Integer(var6)));
+      var11.setValueByPath("DamageFactor", (Object)(new Double(var7)));
+      var11.setValueByPath("FullyInstalled", (Object)(new Boolean(var9)));
+      var11.setValueByPath("Index.X", (Object)var1);
+      var11.setValueByPath("Index.Y", (Object)var2);
       var10.f(var11);
       this.qy[var2][var1] = var11;
    }
@@ -790,8 +790,8 @@ public boolean h(int var1, int var2) {
    public void i(int var1, int var2) {
       if (!this.qz[var2][var1]) {
          JsonObject var3 = new JsonObject();
-         var3.AboutDialogCloseListener("X", (Object)var1);
-         var3.AboutDialogCloseListener("Y", (Object)var2);
+         var3.setValueByPath("X", (Object)var1);
+         var3.setValueByPath("Y", (Object)var2);
          this.qt.d("ValidSlotIndices").f(var3);
          this.qz[var2][var1] = true;
       }
@@ -843,7 +843,7 @@ public boolean k(int var1, int var2) {
       return false;
    }
 
-   public void AboutDialog(int var1, int var2, boolean var3) {
+   public void setSlotEnabled(int var1, int var2, boolean var3) {
       JsonArray var4 = this.qt.d("SpecialSlots");
 
       for(int var5 = 0; var5 < var4.size(); ++var5) {
@@ -852,7 +852,7 @@ public void AboutDialog(int var1, int var2, boolean var3) {
             if (!var3) {
                var4.ac(var5);
             } else {
-               var6.AboutDialogCloseListener("Type.InventorySpecialSlotType", (Object)"TechBonus");
+               var6.setValueByPath("Type.InventorySpecialSlotType", (Object)"TechBonus");
             }
 
             return;
@@ -861,9 +861,9 @@ public void AboutDialog(int var1, int var2, boolean var3) {
 
       if (var3) {
          JsonObject var7 = TemplateLoader.loadTemplate("specialSlot");
-         var7.AboutDialogCloseListener("Type.InventorySpecialSlotType", (Object)"TechBonus");
-         var7.AboutDialogCloseListener("Index.X", (Object)var1);
-         var7.AboutDialogCloseListener("Index.Y", (Object)var2);
+         var7.setValueByPath("Type.InventorySpecialSlotType", (Object)"TechBonus");
+         var7.setValueByPath("Index.X", (Object)var1);
+         var7.setValueByPath("Index.Y", (Object)var2);
          var4.f(var7);
       }
 
@@ -889,9 +889,9 @@ public boolean dr() {
          for(var5 = 0; var5 < this.width; ++var5) {
             if (!var1[var8][var5]) {
                JsonObject var9 = TemplateLoader.loadTemplate("specialSlot");
-               var9.AboutDialogCloseListener("Type.InventorySpecialSlotType", (Object)"TechBonus");
-               var9.AboutDialogCloseListener("Index.X", (Object)var5);
-               var9.AboutDialogCloseListener("Index.Y", (Object)var8);
+               var9.setValueByPath("Type.InventorySpecialSlotType", (Object)"TechBonus");
+               var9.setValueByPath("Index.X", (Object)var5);
+               var9.setValueByPath("Index.Y", (Object)var8);
                var2.f(var9);
                var7 = true;
             }
@@ -971,8 +971,8 @@ public boolean ds() {
       for(var4 = 0; var4 < this.qy.length; ++var4) {
          for(int var6 = 0; var6 < this.qy[var4].length; ++var6) {
             if (this.qy[var4][var6] != null && this.qy[var4][var6].L("DamageFactor") != 0.0D) {
-               this.qy[var4][var6].AboutDialogCloseListener("DamageFactor", (Object)(new Double(0.0D)));
-               this.qy[var4][var6].AboutDialogCloseListener("FullyInstalled", (Object)(new Boolean(true)));
+               this.qy[var4][var6].setValueByPath("DamageFactor", (Object)(new Double(0.0D)));
+               this.qy[var4][var6].setValueByPath("FullyInstalled", (Object)(new Boolean(true)));
                var1 = true;
             }
          }
@@ -1001,7 +1001,7 @@ private static String l(Object var0) {
       return var1.toString();
    }
 
-   public void AboutDialog(PrintStream var1) {
+   public void print(PrintStream var1) {
       var1.print("\t|");
 
       int var2;
@@ -1091,7 +1091,7 @@ public boolean dt() {
          for(int var4 = 0; var4 < this.qy[var3].length; ++var4) {
             int var1;
             if (this.qy[var3][var4] != null && "Technology".equals(this.qy[var3][var4].getValueAsString("Type.InventoryType")) && this.qy[var3][var4].J("Amount") >= 0 && (var1 = this.qy[var3][var4].J("MaxAmount")) > 0) {
-               this.qy[var3][var4].AboutDialogCloseListener("Amount", (Object)(new Integer(var1)));
+               this.qy[var3][var4].setValueByPath("Amount", (Object)(new Integer(var1)));
                var2 = true;
             }
          }
@@ -1107,7 +1107,7 @@ public boolean du() {
          for(int var4 = 0; var4 < this.qy[var3].length; ++var4) {
             int var1;
             if (this.qy[var3][var4] != null && !"Technology".equals(this.qy[var3][var4].getValueAsString("Type.InventoryType")) && (var1 = this.qy[var3][var4].J("MaxAmount")) > 1) {
-               this.qy[var3][var4].AboutDialogCloseListener("Amount", (Object)(new Integer(var1)));
+               this.qy[var3][var4].setValueByPath("Amount", (Object)(new Integer(var1)));
                var2 = true;
             }
          }
@@ -1123,8 +1123,8 @@ public boolean dv() {
          for(int var3 = 0; var3 < this.width; ++var3) {
             if (!this.qz[var2][var3]) {
                JsonObject var4 = new JsonObject();
-               var4.AboutDialogCloseListener("X", (Object)var3);
-               var4.AboutDialogCloseListener("Y", (Object)var2);
+               var4.setValueByPath("X", (Object)var3);
+               var4.setValueByPath("Y", (Object)var2);
                this.qt.d("ValidSlotIndices").f(var4);
                this.qz[var2][var3] = true;
                var1 = true;
diff --git a/nomanssave/InventoryPanel.java b/nomanssave/InventoryPanel.java
index cd7e885..2bd69d3 100644
--- a/nomanssave/InventoryPanel.java
+++ b/nomanssave/InventoryPanel.java
@@ -81,7 +81,7 @@ public class InventoryPanel extends JPanel implements eo {
       this.Race.setVisible(false);
       this.Race.addActionListener(new bR(this));
       var2.add(this.Race);
-      en.AboutDialog(this);
+      en.addListener(this);
       UIManager.addPropertyChangeListener((var1x) -> {
          if ("lookAndFeel".equals(var1x.getPropertyName())) {
             EventQueue.invokeLater(this::af);
@@ -90,7 +90,7 @@ public class InventoryPanel extends JPanel implements eo {
       });
    }
 
-   public void AboutDialog(boolean var1) {
+   public void setEditable(boolean var1) {
       this.Race.setVisible(this.eW == null ? false : var1 || this.eW.dk());
       boolean var2 = this.eW == null ? false : var1 || this.eW.dp();
       synchronized(this.slotsPanel.getTreeLock()) {
@@ -106,7 +106,7 @@ public void AboutDialog(boolean var1) {
       }
    }
 
-   void AboutDialog(Inventory var1) {
+   void updateInventory(Inventory var1) {
       if (this.eW == var1) {
          this.af();
       }
@@ -195,7 +195,7 @@ private void af() {
       this.slotsPanel.updateUI();
    }
 
-   void AboutDialog(List var1) {
+   void updateTemplates(List var1) {
       this.slotPanelList = var1;
       this.eW = null;
       this.eT.updateUI();
@@ -211,7 +211,7 @@ void AboutDialog(List var1) {
 
    }
 
-   private InventorySlotPanel AboutDialog(int var1, int var2) {
+   private InventorySlotPanel createSlotPanel(int var1, int var2) {
       synchronized(this.slotsPanel.getTreeLock()) {
          for(int var4 = 0; var4 < this.slotsPanel.getComponentCount(); ++var4) {
             Component var5 = this.slotsPanel.getComponent(var4);
@@ -227,8 +227,8 @@ private InventorySlotPanel AboutDialog(int var1, int var2) {
       }
    }
 
-   private void AboutDialog(InventorySlotPanel var1) {
-      ItemDefinition var2 = h.AboutDialog(this, this.eW.MultitoolPanel());
+   private void showItemDetails(InventorySlotPanel var1) {
+      ItemDefinition var2 = h.show(this, this.eW.MultitoolPanel());
       if (var2 != null) {
          this.eW.AboutDialog(InventorySlotPanel.h(var1), InventorySlotPanel.i(var1), var2);
          InventorySlotPanel.AccountPanel(var1);
@@ -236,7 +236,7 @@ private void AboutDialog(InventorySlotPanel var1) {
 
    }
 
-   private void AboutDialog(gu var1, InventorySlotPanel var2) {
+   private void moveItem(gu var1, InventorySlotPanel var2) {
       ItemDefinition var3 = ItemDefinition.d(var1.dz());
       int var4;
       if (var3 == null) {
@@ -256,7 +256,7 @@ private void AboutDialog(gu var1, InventorySlotPanel var2) {
 
       List var5 = this.eR.g(var4);
       int var6 = var5.indexOf(this.eW);
-      int var7 = dd.AboutDialog(this, var5, var6);
+      int var7 = dd.show(this, var5, var6);
       if (var7 != var6) {
          Inventory var8 = (Inventory)var5.get(var7);
          if (this.eW.AboutDialog(InventorySlotPanel.h(var2), InventorySlotPanel.i(var2), var8)) {
@@ -267,38 +267,38 @@ private void AboutDialog(gu var1, InventorySlotPanel var2) {
 
    }
 
-   private static String AboutDialog(Object var0) {
+   private static String formatItemId(Object var0) {
       return var0 instanceof fg ? "Archived Tech" : var0.toString();
    }
 
    // $FF: synthetic method
-   static Inventory AboutDialog(InventoryPanel var0) {
+   static Inventory access$getInventory(InventoryPanel var0) {
       return var0.eW;
    }
 
    // $FF: synthetic method
-   static Application AboutDialogCloseListener(InventoryPanel var0) {
+   static Application access$getApplication(InventoryPanel var0) {
       return var0.eR;
    }
 
    // $FF: synthetic method
-   static void AccountPanel(InventoryPanel var0) {
+   static void access$refresh(InventoryPanel var0) {
       var0.af();
    }
 
    // $FF: synthetic method
-   static void AboutDialog(InventoryPanel var0, InventorySlotPanel var1) {
-      var0.AboutDialog(var1);
+   static void access$showItemDetails(InventoryPanel var0, InventorySlotPanel var1) {
+      var0.showItemDetails(var1);
    }
 
    // $FF: synthetic method
-   static void AboutDialog(InventoryPanel var0, gu var1, InventorySlotPanel var2) {
-      var0.AboutDialog(var1, var2);
+   static void access$moveItem(InventoryPanel var0, gu var1, InventorySlotPanel var2) {
+      var0.moveItem(var1, var2);
    }
 
    // $FF: synthetic method
-   static InventorySlotPanel AboutDialog(InventoryPanel var0, int var1, int var2) {
-      return var0.AboutDialog(var1, var2);
+   static InventorySlotPanel access$createSlotPanel(InventoryPanel var0, int var1, int var2) {
+      return var0.createSlotPanel(var1, var2);
    }
 
    // $FF: synthetic method
@@ -317,8 +317,8 @@ static Color ai() {
    }
 
    // $FF: synthetic method
-   static String AboutDialogCloseListener(Object var0) {
-      return AboutDialog(var0);
+   static String access$formatItemId(Object var0) {
+      return formatItemId(var0);
    }
 
    // $FF: synthetic method
@@ -352,7 +352,7 @@ static List d(InventoryPanel var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(InventoryPanel var0, Inventory var1) {
+   static void access$updateInventory(InventoryPanel var0, Inventory var1) {
       var0.eW = var1;
    }
 
diff --git a/nomanssave/InventorySlotPanel.java b/nomanssave/InventorySlotPanel.java
index 4c83d9f..9869efc 100644
--- a/nomanssave/InventorySlotPanel.java
+++ b/nomanssave/InventorySlotPanel.java
@@ -151,12 +151,12 @@ private void aq() {
                ImageIcon var6 = var2 == null ? null : var2.AccountPanel(var5, var5);
                int var7 = 0;
                if (var6 != null) {
-                  this.AboutDialog(var6, var5, var7++);
+                  this.paintIcon(var6, var5, var7++);
                }
 
                Color var8 = var3 ? InventoryPanel.aj() : InventoryPanel.eO;
-               this.AboutDialog(var4, var7++, var8);
-               this.AboutDialog(var1.dA() < 0 ? "" : var1.dA() + "/" + var1.dB(), var7++, var8);
+               this.paintText(var4, var7++, var8);
+               this.paintText(var1.dA() < 0 ? "" : var1.dA() + "/" + var1.dB(), var7++, var8);
                this.setToolTipText(var4);
             }
          } else {
@@ -221,12 +221,12 @@ private void aq() {
                ImageIcon var13 = var2 == null ? null : var2.AccountPanel(var11, var11);
                int var12 = 0;
                if (var13 != null) {
-                  this.AboutDialog(var13, var11, var12++);
+                  this.paintIcon(var13, var11, var12++);
                }
 
                Color var9 = var3 ? InventoryPanel.aj() : InventoryPanel.eO;
-               this.AboutDialog(var10, var12++, var9);
-               this.AboutDialog(var1.dA() < 0 ? " " : var1.dA() + "/" + var1.dB(), var12++, var9);
+               this.paintText(var10, var12++, var9);
+               this.paintText(var1.dA() < 0 ? " " : var1.dA() + "/" + var1.dB(), var12++, var9);
                this.setToolTipText(var10);
             }
          }
@@ -236,7 +236,7 @@ private void aq() {
       this.updateUI();
    }
 
-   private void AboutDialog(ImageIcon var1, int var2, int var3) {
+   private void paintIcon(ImageIcon var1, int var2, int var3) {
       JLabel var4 = new JLabel(var1);
       var4.setPreferredSize(new Dimension(var2, var2));
       GridBagConstraints var5 = new GridBagConstraints();
@@ -248,7 +248,7 @@ private void AboutDialog(ImageIcon var1, int var2, int var3) {
       this.add(var4, var5);
    }
 
-   private void AboutDialog(String var1, int var2, Color var3) {
+   private void paintText(String var1, int var2, Color var3) {
       JLabel var4 = new JLabel();
       var4.setFont(UIManager.getFont("Inventory.font"));
       var4.setBackground((Color)null);
@@ -266,12 +266,12 @@ private void AboutDialog(String var1, int var2, Color var3) {
    }
 
    // $FF: synthetic method
-   static JCheckBoxMenuItem AboutDialogCloseListener(InventorySlotPanel var0) {
+   static JCheckBoxMenuItem access$getEnabledMenuItem(InventorySlotPanel var0) {
       return var0.enabledMenuItem;
    }
 
    // $FF: synthetic method
-   static void AccountPanel(InventorySlotPanel var0) {
+   static void access$repaint(InventorySlotPanel var0) {
       var0.aq();
    }
 
diff --git a/nomanssave/ItemDefinition.java b/nomanssave/ItemDefinition.java
index 56119cb..75fccab 100644
--- a/nomanssave/ItemDefinition.java
+++ b/nomanssave/ItemDefinition.java
@@ -172,7 +172,7 @@ public final ImageIcon N(int var1) {
       }
    }
 
-   public final ImageIcon AccountPanel(int var1, int var2) {
+   public final ImageIcon loadIcon(int var1, int var2) {
       String var3 = this.bi();
       return var3 == null ? null : Application.loadScaledIcon(var3, var1, var2);
    }
@@ -187,7 +187,7 @@ public String toString() {
       return this.id;
    }
 
-   static String AboutDialog(Element var0) {
+   static String getElementText(Element var0) {
       if (var0 == null) {
          throw new IllegalArgumentException();
       } else {
@@ -332,7 +332,7 @@ private static List O(int var0) {
       return var1;
    }
 
-   public static List AboutDialogCloseListener(int var0, String var1) {
+   public static List findByAmmoType(int var0, String var1) {
       String var2 = var1.toUpperCase();
       return (List)jJ.stream().filter((var2x) -> {
          return var2x.getName().toUpperCase().indexOf(var2) >= 0 && O(var0).contains(var2x.bc());
diff --git a/nomanssave/ItemDetailsDialog.java b/nomanssave/ItemDetailsDialog.java
index 2d25348..c1b0772 100644
--- a/nomanssave/ItemDetailsDialog.java
+++ b/nomanssave/ItemDetailsDialog.java
@@ -114,7 +114,7 @@ private ItemDetailsDialog(Frame var1) {
       this.addWindowListener(new ck(this));
    }
 
-   private void AboutDialog(ItemData var1) {
+   private void loadItemData(ItemData var1) {
       this.fB = var1;
       Object var2 = var1.dz();
       this.PS4SaveLocation = ItemDefinition.d(var2);
@@ -147,7 +147,7 @@ private void AboutDialog(ItemData var1) {
          this.SaveSlot.setVisible(true);
 
          try {
-            int var9 = hf.AboutDialogCloseListener(var4, 0, 99999);
+            int var9 = hf.parseIntClamped(var4, 0, 99999);
             this.fC = new Integer(var9);
             this.SaveSlot.setEditable(true);
          } catch (RuntimeException var7) {
@@ -199,32 +199,32 @@ private void AboutDialog(ItemData var1) {
       this.setVisible(true);
    }
 
-   public static void AboutDialog(Container var0, ItemData var1) {
+   public static void showItemDetails(Container var0, ItemData var1) {
       if (fE == null) {
          Frame var2 = JOptionPane.getFrameForComponent(var0);
          fE = new ItemDetailsDialog(var2);
       }
 
-      fE.AboutDialog(var1);
+      fE.loadItemData(var1);
    }
 
    // $FF: synthetic method
-   static Integer AboutDialog(ItemDetailsDialog var0) {
+   static Integer access$getSlotIndex(ItemDetailsDialog var0) {
       return var0.fC;
    }
 
    // $FF: synthetic method
-   static ItemData AboutDialogCloseListener(ItemDetailsDialog var0) {
+   static ItemData access$getItemData(ItemDetailsDialog var0) {
       return var0.fB;
    }
 
    // $FF: synthetic method
-   static ItemDefinition AccountPanel(ItemDetailsDialog var0) {
+   static ItemDefinition access$getItemDefinition(ItemDetailsDialog var0) {
       return var0.PS4SaveLocation;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(ItemDetailsDialog var0, Integer var1) {
+   static void access$setSlotIndex(ItemDetailsDialog var0, Integer var1) {
       var0.fC = var1;
    }
 
@@ -234,7 +234,7 @@ static Integer d(ItemDetailsDialog var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialogCloseListener(ItemDetailsDialog var0, Integer var1) {
+   static void access$setItemData(ItemDetailsDialog var0, Integer var1) {
       var0.fD = var1;
    }
 
diff --git a/nomanssave/JsonArray.java b/nomanssave/JsonArray.java
index d95c15f..af247f4 100644
--- a/nomanssave/JsonArray.java
+++ b/nomanssave/JsonArray.java
@@ -212,7 +212,7 @@ public void clear() {
       this.firePropertyChange("", var1, this);
    }
 
-   void AboutDialog(Object var1, String var2, Object var3, Object var4) {
+   void firePropertyChange(Object var1, String var2, Object var3, Object var4) {
       for(int var5 = 0; var5 < this.length; ++var5) {
          if (var1 == this.values[var5]) {
             this.firePropertyChange("[" + var5 + "]" + var2, var3, var4);
@@ -224,11 +224,11 @@ void AboutDialog(Object var1, String var2, Object var3, Object var4) {
 
    private void firePropertyChange(String var1, Object var2, Object var3) {
       if (this.kD instanceof JsonObject) {
-         ((JsonObject)this.kD).AboutDialog(this, var1, var2, var3);
+         ((JsonObject)this.kD).firePropertyChange(this, var1, var2, var3);
       }
 
       if (this.kD instanceof JsonArray) {
-         ((JsonArray)this.kD).AboutDialog(this, var1, var2, var3);
+         ((JsonArray)this.kD).firePropertyChange(this, var1, var2, var3);
       }
 
    }
@@ -270,7 +270,7 @@ public boolean ab(int var1) {
       return var2 == null ? false : (Boolean)var2;
    }
 
-   public void AboutDialog(int var1, Object var2) {
+   public void setValueAt(int var1, Object var2) {
       this.set(var1, var2);
    }
 
diff --git a/nomanssave/JsonEditorDialog.java b/nomanssave/JsonEditorDialog.java
index 16a728f..2a2985f 100644
--- a/nomanssave/JsonEditorDialog.java
+++ b/nomanssave/JsonEditorDialog.java
@@ -94,7 +94,7 @@ private JsonEditorDialog(Application var1) {
       this.XboxContainerWriter.getActionMap().put("find", var6);
    }
 
-   private boolean AboutDialog(String var1, JsonObject var2) {
+   private boolean loadAndShow(String var1, JsonObject var2) {
       this.setTitle("JSON Editor (Advanced Users Only)");
       this.fS = var1;
       this.XboxSaveLocation = var2;
@@ -162,7 +162,7 @@ private static String ay() {
       return var1.toString();
    }
 
-   private static int AboutDialog(char var0) {
+   private static int hexCharValue(char var0) {
       int var1 = "0123456789ABCDEFabcdef".indexOf(var0);
       if (var1 < 0) {
          throw new RuntimeException("Error decoding hex");
@@ -175,14 +175,14 @@ private static int AboutDialog(char var0) {
       }
    }
 
-   private static void AboutDialog(String var0, ClipboardOwner var1) {
+   private static void setClipboard(String var0, ClipboardOwner var1) {
       StringBuffer var2 = new StringBuffer();
       char[] var3 = var0.toCharArray();
 
       for(int var5 = 0; var5 < var3.length; ++var5) {
          if (var3[var5] == '\\' && var5 + 5 < var3.length && var3[var5 + 1] == 'u') {
             try {
-               int var4 = AboutDialog(var3[var5 + 2]) << 12 | AboutDialog(var3[var5 + 3]) << 8 | AboutDialog(var3[var5 + 4]) << 4 | AboutDialog(var3[var5 + 5]);
+               int var4 = hexCharValue(var3[var5 + 2]) << 12 | hexCharValue(var3[var5 + 3]) << 8 | hexCharValue(var3[var5 + 4]) << 4 | hexCharValue(var3[var5 + 5]);
                if (var4 < 32) {
                   var2.append(var3[var5]);
                   var2.append(var3[var5 + 1]);
@@ -207,12 +207,12 @@ private static void AboutDialog(String var0, ClipboardOwner var1) {
       var6.setContents(var8, var1);
    }
 
-   public static boolean AboutDialog(Application var0, String var1, JsonObject var2) {
+   public static boolean open(Application var0, String var1, JsonObject var2) {
       if (NpcRace == null) {
          NpcRace = new JsonEditorDialog(var0);
       }
 
-      return NpcRace.AboutDialog(var1, var2);
+      return NpcRace.loadAndShow(var1, var2);
    }
 
    public void valueChanged(TreeSelectionEvent var1) {
@@ -250,7 +250,7 @@ public void valueChanged(TreeSelectionEvent var1) {
       }
    }
 
-   void AboutDialog(String var1, boolean var2, boolean var3, boolean var4) {
+   void configure(String var1, boolean var2, boolean var3, boolean var4) {
       String var5 = this.XboxContainerWriter.getText();
       if (!this.Base.equals(var1)) {
          Highlighter var6 = this.XboxContainerWriter.getHighlighter();
@@ -308,32 +308,32 @@ static String az() {
    }
 
    // $FF: synthetic method
-   static void AboutDialogCloseListener(String var0, ClipboardOwner var1) {
-      AboutDialog(var0, var1);
+   static void access$setClipboard(String var0, ClipboardOwner var1) {
+      setClipboard(var0, var1);
    }
 
    // $FF: synthetic method
-   static String AboutDialog(JsonEditorDialog var0) {
+   static String access$getContent(JsonEditorDialog var0) {
       return var0.fS;
    }
 
    // $FF: synthetic method
-   static JsonObject AboutDialogCloseListener(JsonEditorDialog var0) {
+   static JsonObject access$getJson(JsonEditorDialog var0) {
       return var0.XboxSaveLocation;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(JsonEditorDialog var0, boolean var1) {
+   static void access$setModified(JsonEditorDialog var0, boolean var1) {
       var0.ga = var1;
    }
 
    // $FF: synthetic method
-   static void AboutDialogCloseListener(JsonEditorDialog var0, boolean var1) {
+   static void access$setReadOnly(JsonEditorDialog var0, boolean var1) {
       var0.gb = var1;
    }
 
    // $FF: synthetic method
-   static JTextArea AccountPanel(JsonEditorDialog var0) {
+   static JTextArea access$getTextArea(JsonEditorDialog var0) {
       return var0.XboxContainerWriter;
    }
 
diff --git a/nomanssave/JsonObject.java b/nomanssave/JsonObject.java
index eb8824b..230f36c 100644
--- a/nomanssave/JsonObject.java
+++ b/nomanssave/JsonObject.java
@@ -31,11 +31,11 @@ public static JsonObject FileComboBoxModel(String var0) {
       return JsonParser.Q(var0);
    }
 
-   public void AboutDialogCloseListener(String var1, Function var2) {
+   public void addChangeHandler(String var1, Function var2) {
       this.kJ.put(var1, var2);
    }
 
-   void AboutDialog(String var1, Object var2) {
+   void putWithParent(String var1, Object var2) {
       for(int var3 = 0; var3 < this.length; ++var3) {
          if (this.names[var3].equals(var1)) {
             throw new RuntimeException("duplicate key: " + var1);
@@ -166,6 +166,10 @@ public Object put(String var1, Object var2) {
       }
    }
 
+   public void setValueByPath(String var1, Object var2) {
+      this.ValidatedTextField(var1).AboutDialog(var2, false);
+   }
+
    public Object InMemorySaveFile(String var1) {
       if (var1 == null) {
          throw new NullPointerException();
@@ -194,7 +198,7 @@ public Object InMemorySaveFile(String var1) {
       }
    }
 
-   public void AccountPanel(JsonObject var1) {
+   public void deepCopyFrom(JsonObject var1) {
       if (var1 == null) {
          throw new NullPointerException();
       } else {
@@ -206,7 +210,7 @@ public void AccountPanel(JsonObject var1) {
                   Object var5 = this.values[var4];
                   JsonParser.i(var5);
                   if (var5 instanceof JsonObject && var1.values[var2] instanceof JsonObject) {
-                     ((JsonObject)var5).AccountPanel((JsonObject)var1.values[var2]);
+                     ((JsonObject)var5).deepCopyFrom((JsonObject)var1.values[var2]);
                      this.values[var4] = var5;
                   } else {
                      this.values[var4] = var1.values[var2];
@@ -281,11 +285,11 @@ public void clear() {
       this.length = 0;
    }
 
-   public void AboutDialog(PropertyChangeListener var1) {
+   public void addPropertyChangeListener(PropertyChangeListener var1) {
       this.kI = var1;
    }
 
-   void AboutDialog(Object var1, String var2, Object var3, Object var4) {
+   void firePropertyChange(Object var1, String var2, Object var3, Object var4) {
       for(int var5 = 0; var5 < this.length; ++var5) {
          if (var1 == this.values[var5]) {
             this.firePropertyChange(this.names[var5] + var2, var3, var4);
@@ -304,11 +308,11 @@ private void firePropertyChange(String var1, Object var2, Object var3) {
 
       String var4 = var1.length() == 0 ? "" : "." + var1;
       if (this.kD instanceof JsonObject) {
-         ((JsonObject)this.kD).AboutDialog(this, var4, var2, var3);
+         ((JsonObject)this.kD).firePropertyChange(this, var4, var2, var3);
       }
 
       if (this.kD instanceof JsonArray) {
-         ((JsonArray)this.kD).AboutDialog(this, var4, var2, var3);
+         ((JsonArray)this.kD).firePropertyChange(this, var4, var2, var3);
       }
 
    }
@@ -409,7 +413,7 @@ public int J(String var1) {
       return var2 == null ? 0 : ((Number)var2).intValue();
    }
 
-   public int AccountPanel(String var1, int var2) {
+   public int getInt(String var1, int var2) {
       Object var3 = this.getValue(var1);
       return var3 == null ? var2 : ((Number)var3).intValue();
    }
@@ -419,7 +423,7 @@ public long K(String var1) {
       return var2 == null ? 0L : ((Number)var2).longValue();
    }
 
-   public long AboutDialog(String var1, long var2) {
+   public long getLong(String var1, long var2) {
       Object var4 = this.getValue(var1);
       return var4 == null ? var2 : ((Number)var4).longValue();
    }
@@ -429,7 +433,7 @@ public double L(String var1) {
       return var2 == null ? 0.0D : ((Number)var2).doubleValue();
    }
 
-   public double AccountPanel(String var1, double var2) {
+   public double getDouble(String var1, double var2) {
       Object var4 = this.getValue(var1);
       return var4 == null ? var2 : ((Number)var4).doubleValue();
    }
@@ -439,16 +443,16 @@ public boolean M(String var1) {
       return var2 == null ? false : (Boolean)var2;
    }
 
-   public boolean AboutDialog(String var1, boolean var2) {
+   public boolean getBoolean(String var1, boolean var2) {
       Object var3 = this.getValue(var1);
       return var3 == null ? var2 : (Boolean)var3;
    }
 
-   public Object AboutDialogCloseListener(String var1, Object var2) {
+   public Object getOrDefault(String var1, Object var2) {
       return this.ValidatedTextField(var1).AboutDialog(var2, false);
    }
 
-   public Object AccountPanel(String var1, Object var2) {
+   public Object getOrDefaultDeep(String var1, Object var2) {
       return this.ValidatedTextField(var1).AboutDialog(var2, true);
    }
 
@@ -464,7 +468,7 @@ public Object N(String var1) {
       }
    }
 
-   public JsonObject AboutDialogCloseListener(String var1, JsonObject var2) {
+   public JsonObject getOrDefaultObject(String var1, JsonObject var2) {
       return this.ValidatedTextField(var1).e(var2);
    }
 
@@ -497,7 +501,7 @@ public void d(JsonObject var1) {
       }
    }
 
-   public void AccountPanel(File var1) {
+   public void saveToFile(File var1) {
       Throwable var2 = null;
       Object var3 = null;
 
diff --git a/nomanssave/JsonParser.java b/nomanssave/JsonParser.java
index 7fbf1b9..84fb151 100644
--- a/nomanssave/JsonParser.java
+++ b/nomanssave/JsonParser.java
@@ -28,7 +28,7 @@ public class JsonParser {
    };
    static final String gc = "0123456789ABCDEFabcdef";
 
-   static boolean AboutDialog(Class var0) {
+   static boolean isSimpleValue(Class var0) {
       if (var0 == null) {
          return true;
       } else if (Boolean.class.isAssignableFrom(var0)) {
@@ -48,11 +48,11 @@ static boolean AboutDialog(Class var0) {
       }
    }
 
-   public static String AboutDialogCloseListener(Object var0, boolean var1) {
-      return AboutDialog(var0, var1 ? 7 : 0, (Predicate)null);
+   public static String toJson(Object var0, boolean var1) {
+      return formatValue(var0, var1 ? 7 : 0, (Predicate)null);
    }
 
-   public static String AboutDialog(Object var0, int var1, Predicate var2) {
+   public static String formatValue(Object var0, int var1, Predicate var2) {
       String var3 = null;
       if ((var1 & 3) != 0) {
          switch(var1 & 3) {
@@ -68,14 +68,14 @@ public static String AboutDialog(Object var0, int var1, Predicate var2) {
       }
 
       boolean var4 = (var1 & 4) != 0;
-      return AboutDialog(var0, var3, var4, var2);
+      return formatPathFiltered(var0, var3, var4, var2);
    }
 
-   static String AboutDialog(Object var0, String var1, boolean var2) {
-      return AboutDialog((Object)var0, var1, var2, (Predicate)null);
+   static String formatPath(Object var0, String var1, boolean var2) {
+      return formatPathFiltered((Object)var0, var1, var2, (Predicate)null);
    }
 
-   private static String AboutDialog(Object var0, String var1, boolean var2, Predicate var3) {
+   private static String formatPathFiltered(Object var0, String var1, boolean var2, Predicate var3) {
       if (var0 == null) {
          return "null";
       } else if (var0 instanceof Boolean) {
@@ -85,23 +85,23 @@ private static String AboutDialog(Object var0, String var1, boolean var2, Predic
       } else if (var0 instanceof Number) {
          return var0.toString();
       } else if (var0 instanceof String) {
-         return AboutDialogCloseListener((String)var0, var3);
+         return formatString((String)var0, var3);
       } else if (var0 instanceof JsonObject) {
-         return AboutDialog((JsonObject)var0, var1, var2, var3);
+         return toJsonObjectFiltered((JsonObject)var0, var1, var2, var3);
       } else if (var0 instanceof JsonArray) {
-         return AboutDialog((JsonArray)var0, var1, var2, var3);
+         return toJsonArrayFiltered((JsonArray)var0, var1, var2, var3);
       } else if (var0 instanceof fg) {
-         return AboutDialogCloseListener((fg)var0);
+         return formatJsonValue((fg)var0);
       } else {
          throw new RuntimeException("unsupported data type");
       }
    }
 
-   static String AboutDialog(JsonArray var0, String var1, boolean var2) {
-      return AboutDialog((JsonArray)var0, var1, var2, (Predicate)null);
+   static String toJsonArray(JsonArray var0, String var1, boolean var2) {
+      return toJsonArrayFiltered((JsonArray)var0, var1, var2, (Predicate)null);
    }
 
-   private static String AboutDialog(JsonArray var0, String var1, boolean var2, Predicate var3) {
+   private static String toJsonArrayFiltered(JsonArray var0, String var1, boolean var2, Predicate var3) {
       StringBuilder var4 = new StringBuilder();
       var4.append('[');
 
@@ -125,11 +125,11 @@ private static String AboutDialog(JsonArray var0, String var1, boolean var2, Pre
       return var4.toString();
    }
 
-   static String AboutDialog(JsonObject var0, String var1, boolean var2) {
-      return AboutDialog((JsonObject)var0, var1, var2, (Predicate)null);
+   static String toJsonObject(JsonObject var0, String var1, boolean var2) {
+      return toJsonObjectFiltered((JsonObject)var0, var1, var2, (Predicate)null);
    }
 
-   private static String AboutDialog(JsonObject var0, String var1, boolean var2, Predicate var3) {
+   private static String toJsonObjectFiltered(JsonObject var0, String var1, boolean var2, Predicate var3) {
       StringBuilder var4 = new StringBuilder();
       var4.append('{');
 
@@ -142,7 +142,7 @@ private static String AboutDialog(JsonObject var0, String var1, boolean var2, Pr
             var4.append(var1 + "\t");
          }
 
-         var4.append(AboutDialogCloseListener(var0.names[var5], var3));
+         var4.append(formatString(var0.names[var5], var3));
          var4.append(':');
          if (var2) {
             var4.append(' ');
@@ -159,7 +159,7 @@ private static String AboutDialog(JsonObject var0, String var1, boolean var2, Pr
       return var4.toString();
    }
 
-   private static String AboutDialog(fg var0) {
+   private static String formatJsonKey(fg var0) {
       StringBuilder var1 = new StringBuilder();
       byte[] var5;
       int var4 = (var5 = var0.toByteArray()).length;
@@ -197,15 +197,15 @@ private static String AboutDialog(fg var0) {
       return var1.toString();
    }
 
-   private static String AboutDialogCloseListener(fg var0) {
+   private static String formatJsonValue(fg var0) {
       StringBuilder var1 = new StringBuilder();
       var1.append('"');
-      var1.append(AboutDialog(var0));
+      var1.append(formatJsonKey(var0));
       var1.append('"');
       return var1.toString();
    }
 
-   private static String AboutDialog(String var0, Predicate var1) {
+   private static String escapeString(String var0, Predicate var1) {
       StringBuilder var2 = new StringBuilder();
       char[] var6;
       int var5 = (var6 = var0.toCharArray()).length;
@@ -241,20 +241,20 @@ private static String AboutDialog(String var0, Predicate var1) {
    }
 
    static String O(String var0) {
-      return AboutDialogCloseListener(var0, (Predicate)null);
+      return formatString(var0, (Predicate)null);
    }
 
-   private static String AboutDialogCloseListener(String var0, Predicate var1) {
+   private static String formatString(String var0, Predicate var1) {
       StringBuilder var2 = new StringBuilder();
       var2.append('"');
-      var2.append(AboutDialog(var0, var1));
+      var2.append(escapeString(var0, var1));
       var2.append('"');
       return var2.toString();
    }
 
    public static Object P(String var0) {
       fi var1 = new fi(var0);
-      Object var2 = AboutDialog(var1, var1.bI());
+      Object var2 = readValue(var1, var1.bI());
       if (var1.bI() >= 0) {
          throw new JsonParseException("Invalid trailing data", var1.kF, var1.kG);
       } else {
@@ -262,13 +262,13 @@ public static Object P(String var0) {
       }
    }
 
-   private static Object AboutDialog(fi var0, int var1) {
+   private static Object readValue(fi var0, int var1) {
       if (var1 < 0) {
          throw new JsonParseException("Short read", var0.kF, var0.kG);
       } else if (var1 == 123) {
-         return AboutDialog(var0);
+         return readJsonObject(var0);
       } else if (var1 == 91) {
-         return AboutDialogCloseListener(var0);
+         return readJsonArray(var0);
       } else if (var1 == 34) {
          return d(var0);
       } else if (var1 == 102) {
@@ -325,7 +325,7 @@ private static Object AboutDialog(fi var0, int var1) {
       } else if (var1 != 45 && (var1 < 48 || var1 > 57)) {
          throw new JsonParseException("Invalid token", var0.kF, var0.kG);
       } else {
-         return AboutDialogCloseListener(var0, var1);
+         return readNumber(var0, var1);
       }
    }
 
@@ -345,7 +345,7 @@ static JsonObject Q(String var0) {
                   throw new JsonParseException("Invalid object string", var3.kF, var3.kG);
                }
 
-               JsonObject var4 = AboutDialog(var3);
+               JsonObject var4 = readJsonObject(var3);
                if (var3.bI() >= 0) {
                   throw new JsonParseException("Invalid trailing data", var3.kF, var3.kG);
                }
@@ -388,18 +388,18 @@ static JsonObject Q(String var0) {
       }
    }
 
-   private static JsonObject AboutDialog(fi var0) {
+   private static JsonObject readJsonObject(fi var0) {
       JsonObject var1 = new JsonObject();
       int var2 = var0.bI();
       if (var2 == 34) {
          while(true) {
-            String var3 = AccountPanel(var0);
+            String var3 = readKey(var0);
             if (var0.bI() != 58) {
                throw new JsonParseException("Invalid token", var0.kF, var0.kG);
             }
 
-            Object var4 = AboutDialog(var0, var0.bI());
-            var1.AboutDialog(var3, var4);
+            Object var4 = readValue(var0, var0.bI());
+            var1.putWithParent(var3, var4);
             var2 = var0.bI();
             if (var2 == 125) {
                break;
@@ -437,7 +437,7 @@ static JsonArray R(String var0) {
                   throw new JsonParseException("Invalid array string", var3.kF, var3.kG);
                }
 
-               JsonArray var4 = AboutDialogCloseListener(var3);
+               JsonArray var4 = readJsonArray(var3);
                if (var3.bI() >= 0) {
                   throw new JsonParseException("Invalid trailing data", var3.kF, var3.kG);
                }
@@ -480,12 +480,12 @@ static JsonArray R(String var0) {
       }
    }
 
-   private static JsonArray AboutDialogCloseListener(fi var0) {
+   private static JsonArray readJsonArray(fi var0) {
       JsonArray var1 = new JsonArray();
       int var2;
       if ((var2 = var0.bI()) != 93) {
          while(true) {
-            Object var3 = AboutDialog(var0, var2);
+            Object var3 = readValue(var0, var2);
             var1.e(var3);
             var2 = var0.bI();
             if (var2 == 93) {
@@ -520,7 +520,7 @@ static int ae(int var0) {
       }
    }
 
-   private static String AccountPanel(fi var0) {
+   private static String readKey(fi var0) {
       Object var1 = d(var0);
       if (var1 instanceof String) {
          return (String)var1;
@@ -657,10 +657,10 @@ private static fg e(fi var0) {
       }
    }
 
-   private static Number AboutDialogCloseListener(fi var0, int var1) {
+   private static Number readNumber(fi var0, int var1) {
       boolean var3 = false;
       if (var1 == 45) {
-         var1 = fi.AboutDialog(var0, kZ);
+         var1 = fi.access$readWhile(var0, kZ);
          if (var1 < 0) {
             throw new JsonParseException("Invalid token", var0.kF, var0.kG);
          }
@@ -670,15 +670,15 @@ private static Number AboutDialogCloseListener(fi var0, int var1) {
 
       BigDecimal var2 = new BigDecimal(var1 - 48);
       if (var1 != 48) {
-         while((var1 = fi.AboutDialog(var0, kZ)) >= 0) {
+         while((var1 = fi.access$readWhile(var0, kZ)) >= 0) {
             var2 = var2.multiply(BigDecimal.TEN).add(new BigDecimal(var1 - 48));
          }
       }
 
       boolean var4 = true;
-      if (fi.AboutDialog(var0, la) >= 0) {
+      if (fi.access$readWhile(var0, la) >= 0) {
          var4 = false;
-         var1 = fi.AboutDialog(var0, kZ);
+         var1 = fi.access$readWhile(var0, kZ);
          if (var1 < 0) {
             throw new JsonParseException("Invalid token", var0.kF, var0.kG);
          }
@@ -689,16 +689,16 @@ private static Number AboutDialogCloseListener(fi var0, int var1) {
             BigDecimal var10001 = new BigDecimal(var1 - 48);
             --var5;
             var2 = var2.add(var10001.scaleByPowerOfTen(var5));
-         } while((var1 = fi.AboutDialog(var0, kZ)) >= 0);
+         } while((var1 = fi.access$readWhile(var0, kZ)) >= 0);
       }
 
-      if (fi.AboutDialog(var0, lb) >= 0) {
+      if (fi.access$readWhile(var0, lb) >= 0) {
          var4 = false;
-         var1 = fi.AboutDialog(var0, lc);
+         var1 = fi.access$readWhile(var0, lc);
          boolean var9 = false;
          if (var1 == 43 || var1 == 45) {
             var9 = var1 == 45;
-            var1 = fi.AboutDialog(var0, kZ);
+            var1 = fi.access$readWhile(var0, kZ);
          }
 
          if (var1 < 0) {
@@ -710,7 +710,7 @@ private static Number AboutDialogCloseListener(fi var0, int var1) {
          do {
             var6 *= 10;
             var6 += var1 - 48;
-         } while((var1 = fi.AboutDialog(var0, kZ)) >= 0);
+         } while((var1 = fi.access$readWhile(var0, kZ)) >= 0);
 
          if (var9) {
             var6 = -var6;
@@ -748,7 +748,7 @@ static void i(Object var0) {
 
    }
 
-   static void AboutDialog(Object var0, Object var1) {
+   static void setParent(Object var0, Object var1) {
       if (var0 instanceof JsonObject) {
          ((JsonObject)var0).kD = var1;
       }
diff --git a/nomanssave/JsonWriter.java b/nomanssave/JsonWriter.java
index a8adb38..9268d37 100644
--- a/nomanssave/JsonWriter.java
+++ b/nomanssave/JsonWriter.java
@@ -74,7 +74,7 @@ public static byte[] g(JsonObject var0) {
       return var1.toByteArray();
    }
 
-   public static byte[] AboutDialogCloseListener(JsonArray var0) {
+   public static byte[] toBytes(JsonArray var0) {
       ByteArrayOutputStream var1 = new ByteArrayOutputStream();
       Throwable var2 = null;
       Object var3 = null;
@@ -83,7 +83,7 @@ public static byte[] AboutDialogCloseListener(JsonArray var0) {
          JsonWriter var4 = new JsonWriter(var1, 0);
 
          try {
-            var4.AccountPanel(var0);
+            var4.writeJsonArray(var0);
          } finally {
             if (var4 != null) {
                var4.close();
@@ -122,9 +122,9 @@ public void k(Object var1) {
       } else if (var1 instanceof String) {
          this.writeString((String)var1);
       } else if (var1 instanceof fg) {
-         this.AccountPanel((fg)var1);
+         this.writeToken((fg)var1);
       } else if (var1 instanceof fk) {
-         this.AboutDialog((JsonObject)var1, ((fk)var1).li);
+         this.writeJsonObject((JsonObject)var1, ((fk)var1).li);
       } else if (var1 instanceof JsonObject) {
          this.AboutDialog((JsonObject)((JsonObject)var1), (eC)null);
       } else if (var1 instanceof JsonArray) {
@@ -134,12 +134,12 @@ public void k(Object var1) {
             throw new IOException("Cannot write value");
          }
 
-         this.AboutDialog((Number)var1);
+         this.writeNumber((Number)var1);
       }
 
    }
 
-   private void AboutDialog(Object var1, eC var2) {
+   private void writeValue(Object var1, eC var2) {
       if (var1 == null) {
          this.lh.write(le);
       } else if (var1.equals(Boolean.TRUE)) {
@@ -149,17 +149,17 @@ private void AboutDialog(Object var1, eC var2) {
       } else if (var1 instanceof String) {
          this.writeString((String)var1);
       } else if (var1 instanceof fg) {
-         this.AccountPanel((fg)var1);
+         this.writeToken((fg)var1);
       } else if (var1 instanceof JsonObject) {
-         this.AboutDialog((JsonObject)var1, var2);
+         this.writeJsonObject((JsonObject)var1, var2);
       } else if (var1 instanceof JsonArray) {
-         this.AboutDialog((JsonArray)var1, var2);
+         this.writeJsonArrayInternal((JsonArray)var1, var2);
       } else {
          if (!(var1 instanceof Number)) {
             throw new IOException("Cannot write value");
          }
 
-         this.AboutDialog((Number)var1);
+         this.writeNumber((Number)var1);
       }
 
    }
@@ -168,7 +168,7 @@ private void writeString(String var1) {
       this.lh.write(JsonParser.O(var1).getBytes(StandardCharsets.UTF_8));
    }
 
-   private void AccountPanel(fg var1) {
+   private void writeToken(fg var1) {
       this.lh.write(34);
       byte[] var5;
       int var4 = (var5 = var1.toByteArray()).length;
@@ -205,10 +205,10 @@ private void AccountPanel(fg var1) {
    }
 
    public void h(JsonObject var1) {
-      this.AboutDialog(var1, var1 instanceof fk ? ((fk)var1).li : null);
+      this.writeJsonObject(var1, var1 instanceof fk ? ((fk)var1).li : null);
    }
 
-   private void AboutDialog(JsonObject var1, eC var2) {
+   private void writeJsonObject(JsonObject var1, eC var2) {
       this.lh.write(123);
       if (var1.length > 0) {
          for(int var3 = 0; var3 < var1.length; ++var3) {
@@ -218,18 +218,18 @@ private void AboutDialog(JsonObject var1, eC var2) {
 
             this.writeString(var2 == null ? var1.names[var3] : var2.r(var1.names[var3]));
             this.lh.write(58);
-            this.AboutDialog(var1.values[var3], var2);
+            this.writeValue(var1.values[var3], var2);
          }
       }
 
       this.lh.write(125);
    }
 
-   public void AccountPanel(JsonArray var1) {
-      this.AboutDialog((JsonArray)var1, (eC)null);
+   public void writeJsonArray(JsonArray var1) {
+      this.writeJsonArrayInternal((JsonArray)var1, (eC)null);
    }
 
-   private void AboutDialog(JsonArray var1, eC var2) {
+   private void writeJsonArrayInternal(JsonArray var1, eC var2) {
       this.lh.write(91);
       if (var1.length > 0) {
          for(int var3 = 0; var3 < var1.length; ++var3) {
@@ -237,14 +237,14 @@ private void AboutDialog(JsonArray var1, eC var2) {
                this.lh.write(44);
             }
 
-            this.AboutDialog(var1.values[var3], var2);
+            this.writeValue(var1.values[var3], var2);
          }
       }
 
       this.lh.write(93);
    }
 
-   private void AboutDialog(Number var1) {
+   private void writeNumber(Number var1) {
       if (var1 instanceof BigDecimal) {
          this.lh.write(((BigDecimal)var1).toString().replace('E', 'e').getBytes(StandardCharsets.UTF_8));
       } else {
diff --git a/nomanssave/LineNumberPanel.java b/nomanssave/LineNumberPanel.java
index b076fb6..af8ca2a 100644
--- a/nomanssave/LineNumberPanel.java
+++ b/nomanssave/LineNumberPanel.java
@@ -56,8 +56,8 @@ public LineNumberPanel(JTextComponent var1, int var2) {
       this.MultitoolSettings = var1;
       this.setFont(var1.getFont());
       this.UpdateDownloadRunnable(5);
-      this.AboutDialog(Color.RED);
-      this.AboutDialog(1.0F);
+      this.setHighlightColor(Color.RED);
+      this.setMinimumDigits(1.0F);
       this.ShowErrorRunnable(var2);
       var1.getDocument().addDocumentListener(this);
       var1.addCaretListener(this);
@@ -68,7 +68,7 @@ public boolean aD() {
       return this.ShipSettings;
    }
 
-   public void AboutDialogCloseListener(boolean var1) {
+   public void setHighlightLine(boolean var1) {
       this.ShipSettings = var1;
    }
 
@@ -88,7 +88,7 @@ public Color aF() {
       return this.SettlementState == null ? this.getForeground() : this.SettlementState;
    }
 
-   public void AboutDialog(Color var1) {
+   public void setHighlightColor(Color var1) {
       this.SettlementState = var1;
    }
 
@@ -96,7 +96,7 @@ public float aG() {
       return this.gF;
    }
 
-   public void AboutDialog(float var1) {
+   public void setMinimumDigits(float var1) {
       this.gF = var1 > 1.0F ? 1.0F : (var1 < 0.0F ? -1.0F : var1);
    }
 
@@ -146,8 +146,8 @@ public void paintComponent(Graphics var1) {
 
             String var8 = this.WindowCloseListener(var6);
             int var9 = var2.stringWidth(var8);
-            int var10 = this.AboutDialogCloseListener(var4, var9) + var3.left;
-            int var11 = this.AboutDialog(var6, var2);
+            int var10 = this.getLineY(var4, var9) + var3.left;
+            int var11 = this.getLineHeight(var6, var2);
             var1.drawString(var8, var10, var11);
             var6 = Utilities.getRowEnd(this.MultitoolSettings, var6) + 1;
          } catch (Exception var12) {
@@ -170,11 +170,11 @@ protected String WindowCloseListener(int var1) {
       return var4.getStartOffset() == var1 ? String.valueOf(var3 + 1) : "";
    }
 
-   private int AboutDialogCloseListener(int var1, int var2) {
+   private int getLineY(int var1, int var2) {
       return (int)((float)(var1 - var2) * this.gF);
    }
 
-   private int AboutDialog(int var1, FontMetrics var2) {
+   private int getLineHeight(int var1, FontMetrics var2) {
       Rectangle var3 = this.MultitoolSettings.modelToView(var1);
       int var4 = var2.getHeight();
       int var5 = var3.UpdateDownloadRunnable + var3.height;
@@ -252,22 +252,22 @@ public void propertyChange(PropertyChangeEvent var1) {
    }
 
    // $FF: synthetic method
-   static JTextComponent AboutDialog(LineNumberPanel var0) {
+   static JTextComponent access$getTextComponent(LineNumberPanel var0) {
       return var0.MultitoolSettings;
    }
 
    // $FF: synthetic method
-   static int AboutDialogCloseListener(LineNumberPanel var0) {
+   static int access$getUpdateFont(LineNumberPanel var0) {
       return var0.gI;
    }
 
    // $FF: synthetic method
-   static void AccountPanel(LineNumberPanel var0) {
+   static void access$repaint(LineNumberPanel var0) {
       var0.aI();
    }
 
    // $FF: synthetic method
-   static void AboutDialog(LineNumberPanel var0, int var1) {
+   static void access$setUpdateFont(LineNumberPanel var0, int var1) {
       var0.gI = var1;
    }
 }
diff --git a/nomanssave/Logger.java b/nomanssave/Logger.java
index ce2bd26..9fae464 100644
--- a/nomanssave/Logger.java
+++ b/nomanssave/Logger.java
@@ -145,7 +145,7 @@ public static void warn(String var0) {
 
    }
 
-   public static void AboutDialog(String var0, Throwable var1) {
+   public static void warn(String var0, Throwable var1) {
       so.println(d(var0, "WARNING: "));
       if (sq != null) {
          synchronized(sq) {
@@ -234,7 +234,7 @@ private static void close() {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(LogRecord var0) {
+   static void publish(LogRecord var0) {
       log(var0);
    }
 
diff --git a/nomanssave/MilestonesPanel.java b/nomanssave/MilestonesPanel.java
index bac1153..e84be9b 100644
--- a/nomanssave/MilestonesPanel.java
+++ b/nomanssave/MilestonesPanel.java
@@ -98,7 +98,7 @@ void aa() {
 
    }
 
-   private void AboutDialog(gs var1, String var2) {
+   private void addMilestone(gs var1, String var2) {
       for(int var4 = 0; var4 < this.ex.length; ++var4) {
          for(int var5 = 0; var5 < this.ex[var4].getComponentCount(); ++var5) {
             Component var3 = this.ex[var4].getComponent(var5);
@@ -110,7 +110,7 @@ private void AboutDialog(gs var1, String var2) {
 
    }
 
-   void AboutDialog(Exosuit var1) {
+   void updateMilestones(Exosuit var1) {
       this.cp = var1;
 
       for(int var3 = 0; var3 < this.ex.length; ++var3) {
@@ -127,12 +127,12 @@ void AboutDialog(Exosuit var1) {
    }
 
    // $FF: synthetic method
-   static Exosuit AboutDialog(MilestonesPanel var0) {
+   static Exosuit access$getExosuit(MilestonesPanel var0) {
       return var0.cp;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(MilestonesPanel var0, gs var1, String var2) {
-      var0.AboutDialog(var1, var2);
+   static void access$addMilestone(MilestonesPanel var0, gs var1, String var2) {
+      var0.addMilestone(var1, var2);
    }
 }
diff --git a/nomanssave/Multitool.java b/nomanssave/Multitool.java
index e71803f..adda135 100644
--- a/nomanssave/Multitool.java
+++ b/nomanssave/Multitool.java
@@ -29,7 +29,7 @@ public static Multitool[] fromPlayerData(JsonObject var0) {
       }
    }
 
-   public static Multitool AboutDialogCloseListener(JsonObject var0, File var1) {
+   public static Multitool importFromFile(JsonObject var0, File var1) {
       JsonArray var2 = var0.d("Multitools");
       if (var2 != null && var2.size() != 0) {
          int var3 = -1;
@@ -93,7 +93,7 @@ public static Multitool AboutDialogCloseListener(JsonObject var0, File var1) {
       }
    }
 
-   private static Function AboutDialogCloseListener(Multitool var0) {
+   private static Function buildFieldAccessor(Multitool var0) {
       return (var1) -> {
          String var2 = var0.getName();
          if (var2 == null || var2.length() == 0) {
@@ -114,7 +114,7 @@ private static Function AboutDialogCloseListener(Multitool var0) {
          var5 = 10;
       }
 
-      this.qG = new Inventory(AboutDialogCloseListener(this), var3, 2, var4, var5, true, true);
+      this.qG = new Inventory(buildFieldAccessor(this), var3, 2, var4, var5, true, true);
    }
 
    public void j(File var1) {
@@ -154,7 +154,7 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.qF.AboutDialogCloseListener("Name", (Object)var1);
+      this.qF.setValueByPath("Name", (Object)var1);
    }
 
    public String cT() {
@@ -162,7 +162,7 @@ public String cT() {
    }
 
    public void ag(String var1) {
-      this.qF.AboutDialogCloseListener("Resource.Filename", (Object)var1);
+      this.qF.setValueByPath("Resource.Filename", (Object)var1);
    }
 
    public String cK() {
@@ -178,7 +178,7 @@ public String LineNumberPanel() {
    }
 
    public void aj(String var1) {
-      this.qF.AboutDialogCloseListener("Store.Class.InventoryClass", (Object)var1);
+      this.qF.setValueByPath("Store.Class.InventoryClass", (Object)var1);
    }
 
    public Inventory SettlementsPanel() {
@@ -218,7 +218,7 @@ public void f(double var1) {
    }
 
    public void cm() {
-      this.qF.AboutDialogCloseListener("Seed", (Object)(new JsonArray(new Object[]{Boolean.FALSE, "0x0"})));
+      this.qF.setValueByPath("Seed", (Object)(new JsonArray(new Object[]{Boolean.FALSE, "0x0"})));
    }
 
    public String toString() {
diff --git a/nomanssave/MultitoolPanel.java b/nomanssave/MultitoolPanel.java
index 48d12b4..23f8033 100644
--- a/nomanssave/MultitoolPanel.java
+++ b/nomanssave/MultitoolPanel.java
@@ -91,15 +91,15 @@ void ShowWarningRunnable() {
       this.hi.ShowWarningRunnable();
    }
 
-   void AboutDialog(Inventory var1) {
-      this.hi.AboutDialog(var1);
+   void updateInventory(Inventory var1) {
+      this.hi.updateInventory(var1);
    }
 
    Multitool[] aK() {
       return this.hj;
    }
 
-   void AboutDialog(Multitool[] var1, MultitoolSettings var2) {
+   void updateMultitools(Multitool[] var1, MultitoolSettings var2) {
       this.hj = var1;
       if (var1.length == 0) {
          this.ha.setSelectedIndex(-1);
@@ -116,17 +116,17 @@ void AboutDialog(Multitool[] var1, MultitoolSettings var2) {
    }
 
    // $FF: synthetic method
-   static Multitool[] AboutDialog(MultitoolPanel var0) {
+   static Multitool[] access$getMultitools(MultitoolPanel var0) {
       return var0.hj;
    }
 
    // $FF: synthetic method
-   static ValidatedTextField AboutDialogCloseListener(MultitoolPanel var0) {
+   static ValidatedTextField access$getNameField(MultitoolPanel var0) {
       return var0.hb;
    }
 
    // $FF: synthetic method
-   static cN AccountPanel(MultitoolPanel var0) {
+   static cN access$getTypeComboBox(MultitoolPanel var0) {
       return var0.typeComboBox;
    }
 
@@ -166,7 +166,7 @@ static JComboBox j(MultitoolPanel var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(MultitoolPanel var0, Multitool[] var1) {
+   static void access$setMultitools(MultitoolPanel var0, Multitool[] var1) {
       var0.hj = var1;
    }
 }
diff --git a/nomanssave/MultitoolSettings.java b/nomanssave/MultitoolSettings.java
index c6dbc39..2d0d329 100644
--- a/nomanssave/MultitoolSettings.java
+++ b/nomanssave/MultitoolSettings.java
@@ -18,10 +18,10 @@ public int dU() {
    public void aF(int var1) {
       JsonObject var2 = this.oI.H("Multitools[" + var1 + "]");
       if (var2 != null && var2.M("Seed[0]")) {
-         this.oI.AboutDialogCloseListener("ActiveMultioolIndex", (Object)var1);
-         this.oI.AboutDialogCloseListener("WeaponInventory", (Object)var2.H("Store").MilestonesPanel());
-         this.oI.AboutDialogCloseListener("CurrentWeapon.GenerationSeed[1]", (Object)var2.BasesStoragePanel("Seed[1]"));
-         this.oI.AboutDialogCloseListener("CurrentWeapon.Filename", (Object)var2.getValueAsString("Resource.Filename"));
+         this.oI.setValueByPath("ActiveMultioolIndex", (Object)var1);
+         this.oI.setValueByPath("WeaponInventory", (Object)var2.H("Store").MilestonesPanel());
+         this.oI.setValueByPath("CurrentWeapon.GenerationSeed[1]", (Object)var2.BasesStoragePanel("Seed[1]"));
+         this.oI.setValueByPath("CurrentWeapon.Filename", (Object)var2.getValueAsString("Resource.Filename"));
       } else {
          throw new RuntimeException("Cannot set current multitool");
       }
diff --git a/nomanssave/P.java b/nomanssave/P.java
index ddb2601..31ec93a 100644
--- a/nomanssave/P.java
+++ b/nomanssave/P.java
@@ -23,7 +23,7 @@ public void actionPerformed(ActionEvent var1) {
             this.bv.AccountPanel("Cannot move base computer.\nPlease ensure that your base has a suitable Signal Booster / Blueprint Analyser / Beacon placed where you want your base computer to be.");
          } else {
             int var4;
-            if ((var4 = cY.AboutDialog(this.bv.g(), var3)) >= 0) {
+            if ((var4 = cY.show(this.bv.g(), var3)) >= 0) {
                gg var5 = (gg)var3.get(var4);
                Logger.info("Attempting to swap base computer with " + var5.toString() + "...");
                if (var2.AboutDialog(var5)) {
diff --git a/nomanssave/PS4SaveLocation.java b/nomanssave/PS4SaveLocation.java
index 7f0014c..e4867b1 100644
--- a/nomanssave/PS4SaveLocation.java
+++ b/nomanssave/PS4SaveLocation.java
@@ -44,7 +44,7 @@ public class PS4SaveLocation implements SaveLocation {
       FileWatcher.AboutDialog(this, var1);
    }
 
-   private static JsonObject AboutDialog(byte[] var0, eG var1) {
+   private static JsonObject readMetadata(byte[] var0, eG var1) {
       Throwable var2 = null;
       Object var3 = null;
 
@@ -56,7 +56,7 @@ private static JsonObject AboutDialog(byte[] var0, eG var1) {
             JsonObject var17;
             boolean var10001;
             try {
-               var17 = var4.AboutDialog(var1);
+               var17 = var4.readJsonObject(var1);
             } catch (Throwable var15) {
                var10000 = var15;
                var10001 = false;
@@ -187,7 +187,7 @@ public void CompanionsPanel(String var1) {
    }
 
    // $FF: synthetic method
-   static File AboutDialog(PS4SaveLocation var0) {
+   static File access$getDirectory(PS4SaveLocation var0) {
       return var0.lX;
    }
 
@@ -197,8 +197,8 @@ static byte[] bY() {
    }
 
    // $FF: synthetic method
-   static JsonObject AboutDialogCloseListener(byte[] var0, eG var1) {
-      return AboutDialog(var0, var1);
+   static JsonObject access$readMetadata(byte[] var0, eG var1) {
+      return readMetadata(var0, var1);
    }
 
    // $FF: synthetic method
@@ -207,7 +207,7 @@ static byte[] l(JsonObject var0) {
    }
 
    // $FF: synthetic method
-   static fD[] AboutDialogCloseListener(PS4SaveLocation var0) {
+   static fD[] access$getSaveFiles(PS4SaveLocation var0) {
       return var0.lZ;
    }
 
diff --git a/nomanssave/Q.java b/nomanssave/Q.java
index 3dd23c8..da4fb2e 100644
--- a/nomanssave/Q.java
+++ b/nomanssave/Q.java
@@ -64,7 +64,7 @@ private Q(Frame var1) {
       this.pack();
    }
 
-   private W AboutDialog(W var1, int var2, int var3) {
+   private W a(W var1, int var2, int var3) {
       this.bw = var1;
       this.bx = var2;
       this.by = var3;
@@ -76,27 +76,27 @@ private W AboutDialog(W var1, int var2, int var3) {
       return this.bz;
    }
 
-   public static W AboutDialog(Container var0, W var1, int var2, int var3) {
+   public static W a(Container var0, W var1, int var2, int var3) {
       if (bC == null) {
          Frame var4 = JOptionPane.getFrameForComponent(var0);
          bC = new Q(var4);
       }
 
-      return bC.AboutDialog(var1, var2, var3);
+      return bC.a(var1, var2, var3);
    }
 
    // $FF: synthetic method
-   static JTextField AboutDialog(Q var0) {
+   static JTextField a(Q var0) {
       return var0.bA;
    }
 
    // $FF: synthetic method
-   static int AboutDialogCloseListener(Q var0) {
+   static int b(Q var0) {
       return var0.bx;
    }
 
    // $FF: synthetic method
-   static W AccountPanel(Q var0) {
+   static W c(Q var0) {
       return var0.bw;
    }
 
@@ -111,7 +111,7 @@ static int e(Q var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(Q var0, W var1) {
+   static void a(Q var0, W var1) {
       var0.bz = var1;
    }
 }
diff --git a/nomanssave/SaveChangeListener.java b/nomanssave/SaveChangeListener.java
index 876de05..e46d0cc 100644
--- a/nomanssave/SaveChangeListener.java
+++ b/nomanssave/SaveChangeListener.java
@@ -1,7 +1,7 @@
 package nomanssave;
 
 public interface SaveChangeListener {
-   void AboutDialog(SaveLocation var1);
+   void onSaveLocationChanged(SaveLocation var1);
 
-   void AboutDialog(SaveLocation var1, int var2, String var3);
+   void onFileChanged(SaveLocation var1, int var2, String var3);
 }
diff --git a/nomanssave/SaveFile.java b/nomanssave/SaveFile.java
index a5f6513..a062da5 100644
--- a/nomanssave/SaveFile.java
+++ b/nomanssave/SaveFile.java
@@ -7,7 +7,7 @@ public interface SaveFile {
 
    JsonObject M();
 
-   String AboutDialogCloseListener(JsonObject var1);
+   String writeToFile(JsonObject var1);
 
    long lastModified();
 
diff --git a/nomanssave/SaveFileMetadata.java b/nomanssave/SaveFileMetadata.java
index 607f267..533c0bc 100644
--- a/nomanssave/SaveFileMetadata.java
+++ b/nomanssave/SaveFileMetadata.java
@@ -145,14 +145,14 @@ public static SaveFileMetadata am(int var0) {
       return new SaveFileMetadata(6, var0, 2004, new byte[376]);
    }
 
-   public static SaveFileMetadata AboutDialog(int var0, byte[] var1) {
-      return AboutDialog(var0, var1, 0, var1.length);
+   public static SaveFileMetadata parse(int var0, byte[] var1) {
+      return parse(var0, var1, 0, var1.length);
    }
 
-   public static SaveFileMetadata AboutDialog(int var0, byte[] var1, int var2, int var3) {
+   public static SaveFileMetadata parse(int var0, byte[] var1, int var2, int var3) {
       if (var3 >= 8 && var3 % 4 == 0) {
          int var4 = var3 == 104 ? 8 : 6;
-         long[] var5 = AboutDialog(var1, var2, var3);
+         long[] var5 = parseLongs(var1, var2, var3);
          long var6 = 0L;
 
          int var8;
@@ -196,7 +196,7 @@ public static SaveFileMetadata AboutDialog(int var0, byte[] var1, int var2, int
             if (!ai(var13)) {
                throw new IOException("Invalid or unsupported format in metadata header: " + Integer.toHexString(var13));
             } else {
-               byte[] var21 = AboutDialog((long[])var5, 2, var5.length - 2);
+               byte[] var21 = toLongBytes((long[])var5, 2, var5.length - 2);
                return new SaveFileMetadata(var4, var0, var13, var21);
             }
          }
@@ -241,7 +241,7 @@ public byte[] encode() {
          var10 = var6[var7];
       }
 
-      return AboutDialog((long[])var6, 0, var6.length);
+      return toLongBytes((long[])var6, 0, var6.length);
    }
 
    private int getInt(int var1) {
@@ -380,7 +380,7 @@ private static long rotateLeft(long var0, int var2) {
       return (var0 & var3) << var2 | var0 >>> 32 - var2;
    }
 
-   private static byte[] AboutDialog(long[] var0, int var1, int var2) {
+   private static byte[] toLongBytes(long[] var0, int var1, int var2) {
       byte[] var3 = new byte[var2 * 4];
 
       for(int var4 = 0; var4 < var2; ++var4) {
@@ -394,10 +394,10 @@ private static byte[] AboutDialog(long[] var0, int var1, int var2) {
    }
 
    private static long[] g(byte[] var0) {
-      return AboutDialog((byte[])var0, 0, var0.length);
+      return parseLongs((byte[])var0, 0, var0.length);
    }
 
-   private static long[] AboutDialog(byte[] var0, int var1, int var2) {
+   private static long[] parseLongs(byte[] var0, int var1, int var2) {
       long[] var3 = new long[var2 / 4];
 
       for(int var4 = 0; var4 < var2; var4 += 4) {
diff --git a/nomanssave/SaveLocation.java b/nomanssave/SaveLocation.java
index 8e4b7dd..fea28fc 100644
--- a/nomanssave/SaveLocation.java
+++ b/nomanssave/SaveLocation.java
@@ -8,7 +8,7 @@
 public interface SaveLocation {
    int lz = 15;
 
-   static String AccountPanel(long var0) {
+   static String formatPlayTime(long var0) {
       int var2 = (int)(var0 % 60L);
       var0 /= 60L;
       int var3 = (int)(var0 % 60L);
@@ -125,7 +125,7 @@ default boolean bW() {
       return false;
    }
 
-   default String AboutDialog(int var1, JsonObject var2) {
+   default String createSaveSlot(int var1, JsonObject var2) {
       throw new IOException("cannot create slot " + (var1 + 1));
    }
 
diff --git a/nomanssave/SettlementState.java b/nomanssave/SettlementState.java
index 35d99b1..a8bbc16 100644
--- a/nomanssave/SettlementState.java
+++ b/nomanssave/SettlementState.java
@@ -47,7 +47,7 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.bf.AboutDialogCloseListener("Name", (Object)var1);
+      this.bf.setValueByPath("Name", (Object)var1);
    }
 
    public int aq(int var1) {
@@ -58,11 +58,11 @@ public void e(int var1, int var2) {
       this.bf.d("Stats").AboutDialog(var1, var2);
    }
 
-   public int AboutDialog(gG var1) {
+   public int getStat(gG var1) {
       return this.bf.d("Stats").Y(var1.ordinal());
    }
 
-   public void AboutDialog(gG var1, int var2) {
+   public void setStat(gG var1, int var2) {
       this.bf.d("Stats").AboutDialog(var1.ordinal(), var2);
    }
 
@@ -74,7 +74,7 @@ public String AppSettings(int var1) {
       return this.bf.d("Perks").CompanionsPanel(var1);
    }
 
-   public void AccountPanel(int var1, String var2) {
+   public void setPerk(int var1, String var2) {
       this.bf.d("Perks").AboutDialog(var1, var2);
    }
 
@@ -83,7 +83,7 @@ public String cK() {
    }
 
    public void aa(String var1) {
-      this.bf.AboutDialogCloseListener("SeedValue", (Object)var1);
+      this.bf.setValueByPath("SeedValue", (Object)var1);
    }
 
    public gF[] dX() {
diff --git a/nomanssave/SettlementsPanel.java b/nomanssave/SettlementsPanel.java
index 02d7a87..16b182a 100644
--- a/nomanssave/SettlementsPanel.java
+++ b/nomanssave/SettlementsPanel.java
@@ -79,7 +79,7 @@ SettlementState[] aN() {
       return this.hC;
    }
 
-   void AboutDialog(SettlementState[] var1) {
+   void updateSettlements(SettlementState[] var1) {
       if (var1.length == 0) {
          this.hC = new SettlementState[0];
          this.hx.setSelectedIndex(-1);
@@ -92,17 +92,17 @@ void AboutDialog(SettlementState[] var1) {
    }
 
    // $FF: synthetic method
-   static JComboBox AboutDialog(SettlementsPanel var0) {
+   static JComboBox access$getComboBox(SettlementsPanel var0) {
       return var0.hx;
    }
 
    // $FF: synthetic method
-   static SettlementState[] AboutDialogCloseListener(SettlementsPanel var0) {
+   static SettlementState[] access$getSettlements(SettlementsPanel var0) {
       return var0.hC;
    }
 
    // $FF: synthetic method
-   static ValidatedTextField AccountPanel(SettlementsPanel var0) {
+   static ValidatedTextField access$getSeedField(SettlementsPanel var0) {
       return var0.hy;
    }
 
diff --git a/nomanssave/ShipSettings.java b/nomanssave/ShipSettings.java
index df10051..8bc4ce7 100644
--- a/nomanssave/ShipSettings.java
+++ b/nomanssave/ShipSettings.java
@@ -16,7 +16,7 @@ public int dV() {
    }
 
    public void aG(int var1) {
-      this.oI.AboutDialogCloseListener("PrimaryShip", (Object)var1);
+      this.oI.setValueByPath("PrimaryShip", (Object)var1);
    }
 
    public int dM() {
@@ -24,7 +24,7 @@ public int dM() {
    }
 
    public void aB(int var1) {
-      this.oI.AboutDialogCloseListener("ShipHealth", (Object)(new Integer(var1)));
+      this.oI.setValueByPath("ShipHealth", (Object)(new Integer(var1)));
    }
 
    public int ShipsPanel() {
@@ -32,6 +32,6 @@ public int ShipsPanel() {
    }
 
    public void aC(int var1) {
-      this.oI.AboutDialogCloseListener("ShipShield", (Object)(new Integer(var1)));
+      this.oI.setValueByPath("ShipShield", (Object)(new Integer(var1)));
    }
 }
diff --git a/nomanssave/ShipsPanel.java b/nomanssave/ShipsPanel.java
index 942839a..cc1e280 100644
--- a/nomanssave/ShipsPanel.java
+++ b/nomanssave/ShipsPanel.java
@@ -50,7 +50,7 @@ public class ShipsPanel extends SplitFormPanel {
             }
 
             var3.ag(var2x);
-            this.hW.AboutDialog(var3.cC());
+            this.hW.updateInventory(var3.cC());
             this.hK.updateUI();
          }
 
@@ -107,7 +107,7 @@ void AppStartupRunnable() {
                Logger.info(var1x + ": technology recharged");
             }
 
-            this.hW.AboutDialog(var1x);
+            this.hW.updateInventory(var1x);
          });
       }
 
@@ -120,7 +120,7 @@ void UpdateCheckThread() {
                Logger.info(var1x + ": items refilled");
             }
 
-            this.hW.AboutDialog(var1x);
+            this.hW.updateInventory(var1x);
          });
       }
 
@@ -133,7 +133,7 @@ void UpdateDownloadRunnable() {
                Logger.info(var1x + ": all slots enabled");
             }
 
-            this.hW.AboutDialog(var1x);
+            this.hW.updateInventory(var1x);
          });
       }
 
@@ -146,7 +146,7 @@ void ShowErrorRunnable() {
                Logger.info(var1x + ": all slots repaired");
             }
 
-            this.hW.AboutDialog(var1x);
+            this.hW.updateInventory(var1x);
          });
       }
 
@@ -159,21 +159,21 @@ void ShowWarningRunnable() {
                Logger.info(var1x + ": inventory expanded");
             }
 
-            this.hW.AboutDialog(var1x);
+            this.hW.updateInventory(var1x);
          });
       }
 
    }
 
-   void AboutDialog(Inventory var1) {
-      this.hW.AboutDialog(var1);
+   void updateInventory(Inventory var1) {
+      this.hW.updateInventory(var1);
    }
 
    Starship[] aO() {
       return this.hX;
    }
 
-   void AboutDialog(Starship[] var1, ShipSettings var2) {
+   void updateShips(Starship[] var1, ShipSettings var2) {
       this.hX = var1;
       this.hY = var2;
       if (var1.length == 0) {
@@ -199,17 +199,17 @@ void AboutDialog(Starship[] var1, ShipSettings var2) {
    }
 
    // $FF: synthetic method
-   static Starship[] AboutDialog(ShipsPanel var0) {
+   static Starship[] access$getShips(ShipsPanel var0) {
       return var0.hX;
    }
 
    // $FF: synthetic method
-   static ValidatedTextField AboutDialogCloseListener(ShipsPanel var0) {
+   static ValidatedTextField access$getNameField(ShipsPanel var0) {
       return var0.hL;
    }
 
    // $FF: synthetic method
-   static cN AccountPanel(ShipsPanel var0) {
+   static cN access$getTypeComboBox(ShipsPanel var0) {
       return var0.hM;
    }
 
@@ -279,7 +279,7 @@ static JComboBox p(ShipsPanel var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(ShipsPanel var0, Starship[] var1) {
+   static void access$setShips(ShipsPanel var0, Starship[] var1) {
       var0.hX = var1;
    }
 }
diff --git a/nomanssave/SlotComboBoxModel.java b/nomanssave/SlotComboBoxModel.java
index d8b508e..35cc405 100644
--- a/nomanssave/SlotComboBoxModel.java
+++ b/nomanssave/SlotComboBoxModel.java
@@ -60,7 +60,7 @@ public void setSelectedItem(Object var1) {
    }
 
    public Object getSelectedItem() {
-      return Application.AccountPanel(this.aZ) < 0 ? null : Application.d(this.aZ)[Application.AccountPanel(this.aZ)];
+      return Application.access$getSlotIndex(this.aZ) < 0 ? null : Application.d(this.aZ)[Application.access$getSlotIndex(this.aZ)];
    }
 
    // $FF: synthetic method
diff --git a/nomanssave/SplitFormPanel.java b/nomanssave/SplitFormPanel.java
index aa2f96c..2d6800d 100644
--- a/nomanssave/SplitFormPanel.java
+++ b/nomanssave/SplitFormPanel.java
@@ -25,7 +25,7 @@ public class SplitFormPanel extends JPanel {
       this.add(this.it, var2);
    }
 
-   void AboutDialogCloseListener(JComponent var1) {
+   void setRightComponent(JComponent var1) {
       GridBagConstraints var2 = new GridBagConstraints();
       var2.fill = 1;
       var2.gridx = 1;
@@ -37,20 +37,20 @@ void k(String var1) {
       this.it.k(var1);
    }
 
-   void AboutDialog(String var1, ValidatedTextField var2) {
-      this.it.AboutDialog(var1, var2);
+   void addRow(String var1, ValidatedTextField var2) {
+      this.it.addRow(var1, var2);
    }
 
-   void AboutDialog(String var1, JComponent var2) {
-      this.it.AboutDialog(var1, var2);
+   void addRow(String var1, JComponent var2) {
+      this.it.addRow(var1, var2);
    }
 
-   void AboutDialog(String var1, boolean var2, JComponent var3) {
-      this.it.AboutDialog(var1, var2, var3);
+   void addRow(String var1, boolean var2, JComponent var3) {
+      this.it.addRow(var1, var2, var3);
    }
 
-   void AboutDialog(JComponent var1) {
-      this.it.AboutDialog(var1);
+   void addRow(JComponent var1) {
+      this.it.addRow(var1);
    }
 
    void Y() {
diff --git a/nomanssave/SpookyHash.java b/nomanssave/SpookyHash.java
index 55e4ba7..204d9a5 100644
--- a/nomanssave/SpookyHash.java
+++ b/nomanssave/SpookyHash.java
@@ -13,11 +13,11 @@ public class SpookyHash {
    private final long sG;
    private final long sH;
 
-   private static long AboutDialog(byte[] var0, int var1) {
+   private static long readLong(byte[] var0, int var1) {
       return ((long)var0[var1 + 7] & 255L) << 56 | ((long)var0[var1 + 6] & 255L) << 48 | ((long)var0[var1 + 5] & 255L) << 40 | ((long)var0[var1 + 4] & 255L) << 32 | ((long)var0[var1 + 3] & 255L) << 24 | ((long)var0[var1 + 2] & 255L) << 16 | ((long)var0[var1 + 1] & 255L) << 8 | (long)var0[var1] & 255L;
    }
 
-   private static long AboutDialogCloseListener(byte[] var0, int var1, int var2) {
+   private static long readPartialLong(byte[] var0, int var1, int var2) {
       long var3 = 0L;
       switch(var2) {
       case 7:
@@ -39,7 +39,7 @@ private static long AboutDialogCloseListener(byte[] var0, int var1, int var2) {
       }
    }
 
-   private static void AboutDialog(byte[] var0, int var1, int var2, long[] var3) {
+   private static void mix(byte[] var0, int var1, int var2, long[] var3) {
       long var4 = var3[0];
       long var6 = var3[1];
       long var8 = -2401053088876216593L;
@@ -48,8 +48,8 @@ private static void AboutDialog(byte[] var0, int var1, int var2, long[] var3) {
 
       int var13;
       for(var13 = var1; var12 >= 32; var12 -= 32) {
-         var8 += AboutDialog(var0, var13);
-         var10 += AboutDialog(var0, var13 + 8);
+         var8 += readLong(var0, var13);
+         var10 += readLong(var0, var13 + 8);
          var8 = var8 << 50 | var8 >>> 14;
          var8 += var10;
          var4 ^= var8;
@@ -86,14 +86,14 @@ private static void AboutDialog(byte[] var0, int var1, int var2, long[] var3) {
          var6 = var6 << 36 | var6 >>> 28;
          var6 += var8;
          var10 ^= var6;
-         var4 += AboutDialog(var0, var13 + 16);
-         var6 += AboutDialog(var0, var13 + 24);
+         var4 += readLong(var0, var13 + 16);
+         var6 += readLong(var0, var13 + 24);
          var13 += 32;
       }
 
       if (var12 >= 16) {
-         var8 += AboutDialog(var0, var13);
-         var10 += AboutDialog(var0, var13 + 8);
+         var8 += readLong(var0, var13);
+         var10 += readLong(var0, var13 + 8);
          var13 += 16;
          var12 -= 16;
          var8 = var8 << 50 | var8 >>> 14;
@@ -136,14 +136,14 @@ private static void AboutDialog(byte[] var0, int var1, int var2, long[] var3) {
 
       var10 += (long)var2 << 56;
       if (var12 >= 8) {
-         var8 += AboutDialog(var0, var13);
+         var8 += readLong(var0, var13);
          var13 += 8;
          var12 -= 8;
          if (var12 > 0) {
-            var10 += AboutDialogCloseListener(var0, var13, var12);
+            var10 += readPartialLong(var0, var13, var12);
          }
       } else if (var12 > 0) {
-         var8 += AboutDialogCloseListener(var0, var13, var12);
+         var8 += readPartialLong(var0, var13, var12);
       } else {
          var8 += -2401053088876216593L;
          var10 += -2401053088876216593L;
@@ -186,9 +186,9 @@ private static void AboutDialog(byte[] var0, int var1, int var2, long[] var3) {
       var3[1] = var6;
    }
 
-   public static long AboutDialogCloseListener(byte[] var0, int var1, int var2, long[] var3) {
+   public static long hashLongs(byte[] var0, int var1, int var2, long[] var3) {
       if (var2 < 192) {
-         AboutDialog(var0, var1, var2, var3);
+         mix(var0, var1, var2, var3);
          return var3[0];
       } else {
          long var10;
@@ -207,62 +207,62 @@ public static long AboutDialogCloseListener(byte[] var0, int var1, int var2, lon
 
          int var29;
          for(var29 = var1; var28 >= 96; var29 += 96) {
-            var4 += AboutDialog(var0, var29);
+            var4 += readLong(var0, var29);
             var8 ^= var24;
             var26 ^= var4;
             var4 = var4 << 11 | var4 >>> 53;
             var26 += var6;
-            var6 += AboutDialog(var0, var29 + 8);
+            var6 += readLong(var0, var29 + 8);
             var10 ^= var26;
             var4 ^= var6;
             var6 = var6 << 32 | var6 >>> 32;
             var4 += var8;
-            var8 += AboutDialog(var0, var29 + 16);
+            var8 += readLong(var0, var29 + 16);
             var12 ^= var4;
             var6 ^= var8;
             var8 = var8 << 43 | var8 >>> 21;
             var6 += var10;
-            var10 += AboutDialog(var0, var29 + 24);
+            var10 += readLong(var0, var29 + 24);
             var14 ^= var6;
             var8 ^= var10;
             var10 = var10 << 31 | var10 >>> 33;
             var8 += var12;
-            var12 += AboutDialog(var0, var29 + 32);
+            var12 += readLong(var0, var29 + 32);
             var16 ^= var8;
             var10 ^= var12;
             var12 = var12 << 17 | var12 >>> 47;
             var10 += var14;
-            var14 += AboutDialog(var0, var29 + 40);
+            var14 += readLong(var0, var29 + 40);
             var18 ^= var10;
             var12 ^= var14;
             var14 = var14 << 28 | var14 >>> 36;
             var12 += var16;
-            var16 += AboutDialog(var0, var29 + 48);
+            var16 += readLong(var0, var29 + 48);
             var20 ^= var12;
             var14 ^= var16;
             var16 = var16 << 39 | var16 >>> 25;
             var14 += var18;
-            var18 += AboutDialog(var0, var29 + 56);
+            var18 += readLong(var0, var29 + 56);
             var22 ^= var14;
             var16 ^= var18;
             var18 = var18 << 57 | var18 >>> 7;
             var16 += var20;
-            var20 += AboutDialog(var0, var29 + 64);
+            var20 += readLong(var0, var29 + 64);
             var24 ^= var16;
             var18 ^= var20;
             var20 = var20 << 55 | var20 >>> 9;
             var18 += var22;
-            var22 += AboutDialog(var0, var29 + 72);
+            var22 += readLong(var0, var29 + 72);
             var26 ^= var18;
             var20 ^= var22;
             var22 = var22 << 54 | var22 >>> 10;
             var20 += var24;
-            var24 += AboutDialog(var0, var29 + 80);
+            var24 += readLong(var0, var29 + 80);
             var4 ^= var20;
             var22 ^= var24;
             var24 = var24 << 22 | var24 >>> 42;
             var22 += var26;
-            var26 += AboutDialog(var0, var29 + 88);
+            var26 += readLong(var0, var29 + 88);
             var6 ^= var22;
             var24 ^= var26;
             var26 = var26 << 46 | var26 >>> 18;
@@ -273,7 +273,7 @@ public static long AboutDialogCloseListener(byte[] var0, int var1, int var2, lon
          int var30 = var28 & 7;
          int var31 = var28 >>> 3;
          if (var30 > 0) {
-            long var32 = AboutDialogCloseListener(var0, var29 + (var31 << 3), var30);
+            long var32 = readPartialLong(var0, var29 + (var31 << 3), var30);
             switch(var31) {
             case 0:
                var4 += var32;
@@ -315,27 +315,27 @@ public static long AboutDialogCloseListener(byte[] var0, int var1, int var2, lon
 
          switch(var31) {
          case 11:
-            var24 += AboutDialog(var0, var29 + 80);
+            var24 += readLong(var0, var29 + 80);
          case 10:
-            var22 += AboutDialog(var0, var29 + 72);
+            var22 += readLong(var0, var29 + 72);
          case 9:
-            var20 += AboutDialog(var0, var29 + 64);
+            var20 += readLong(var0, var29 + 64);
          case 8:
-            var18 += AboutDialog(var0, var29 + 56);
+            var18 += readLong(var0, var29 + 56);
          case 7:
-            var16 += AboutDialog(var0, var29 + 48);
+            var16 += readLong(var0, var29 + 48);
          case 6:
-            var14 += AboutDialog(var0, var29 + 40);
+            var14 += readLong(var0, var29 + 40);
          case 5:
-            var12 += AboutDialog(var0, var29 + 32);
+            var12 += readLong(var0, var29 + 32);
          case 4:
-            var10 += AboutDialog(var0, var29 + 24);
+            var10 += readLong(var0, var29 + 24);
          case 3:
-            var8 += AboutDialog(var0, var29 + 16);
+            var8 += readLong(var0, var29 + 16);
          case 2:
-            var6 += AboutDialog(var0, var29 + 8);
+            var6 += readLong(var0, var29 + 8);
          case 1:
-            var4 += AboutDialog(var0, var29);
+            var4 += readLong(var0, var29);
          default:
             var26 += (long)var28 << 56;
 
@@ -385,11 +385,11 @@ public static long AboutDialogCloseListener(byte[] var0, int var1, int var2, lon
       }
    }
 
-   private static long AboutDialog(CharSequence var0, int var1) {
+   private static long readChar4(CharSequence var0, int var1) {
       return (long)var0.charAt(var1 + 3) << 48 | (long)var0.charAt(var1 + 2) << 32 | (long)var0.charAt(var1 + 1) << 16 | (long)var0.charAt(var1);
    }
 
-   private static long AboutDialog(CharSequence var0, int var1, int var2) {
+   private static long readPartialChars(CharSequence var0, int var1, int var2) {
       long var3 = 0L;
       switch(var2) {
       case 3:
@@ -403,7 +403,7 @@ private static long AboutDialog(CharSequence var0, int var1, int var2) {
       }
    }
 
-   private static void AboutDialog(CharSequence var0, int var1, int var2, long[] var3) {
+   private static void mixChars(CharSequence var0, int var1, int var2, long[] var3) {
       long var4 = var3[0];
       long var6 = var3[1];
       long var8 = -2401053088876216593L;
@@ -412,8 +412,8 @@ private static void AboutDialog(CharSequence var0, int var1, int var2, long[] va
 
       int var13;
       for(var13 = var1; var12 >= 16; var12 -= 16) {
-         var8 += AboutDialog(var0, var13);
-         var10 += AboutDialog(var0, var13 + 4);
+         var8 += readChar4(var0, var13);
+         var10 += readChar4(var0, var13 + 4);
          var8 = var8 << 50 | var8 >>> 14;
          var8 += var10;
          var4 ^= var8;
@@ -450,14 +450,14 @@ private static void AboutDialog(CharSequence var0, int var1, int var2, long[] va
          var6 = var6 << 36 | var6 >>> 28;
          var6 += var8;
          var10 ^= var6;
-         var4 += AboutDialog(var0, var13 + 8);
-         var6 += AboutDialog(var0, var13 + 12);
+         var4 += readChar4(var0, var13 + 8);
+         var6 += readChar4(var0, var13 + 12);
          var13 += 16;
       }
 
       if (var12 >= 8) {
-         var8 += AboutDialog(var0, var13);
-         var10 += AboutDialog(var0, var13 + 4);
+         var8 += readChar4(var0, var13);
+         var10 += readChar4(var0, var13 + 4);
          var13 += 8;
          var12 -= 8;
          var8 = var8 << 50 | var8 >>> 14;
@@ -500,14 +500,14 @@ private static void AboutDialog(CharSequence var0, int var1, int var2, long[] va
 
       var10 += (long)(var2 << 1) << 56;
       if (var12 >= 4) {
-         var8 += AboutDialog(var0, var13);
+         var8 += readChar4(var0, var13);
          var13 += 4;
          var12 -= 4;
          if (var12 > 0) {
-            var10 += AboutDialog(var0, var13, var12);
+            var10 += readPartialChars(var0, var13, var12);
          }
       } else if (var12 > 0) {
-         var8 += AboutDialog(var0, var13, var12);
+         var8 += readPartialChars(var0, var13, var12);
       } else {
          var8 += -2401053088876216593L;
          var10 += -2401053088876216593L;
@@ -550,9 +550,9 @@ private static void AboutDialog(CharSequence var0, int var1, int var2, long[] va
       var3[1] = var6;
    }
 
-   public static long AboutDialogCloseListener(CharSequence var0, int var1, int var2, long[] var3) {
+   public static long hashString(CharSequence var0, int var1, int var2, long[] var3) {
       if (var2 < 96) {
-         AboutDialog(var0, var1, var2, var3);
+         mixChars(var0, var1, var2, var3);
          return var3[0];
       } else {
          long var10;
@@ -571,62 +571,62 @@ public static long AboutDialogCloseListener(CharSequence var0, int var1, int var
 
          int var29;
          for(var29 = var1; var28 >= 48; var29 += 48) {
-            var4 += AboutDialog(var0, var29);
+            var4 += readChar4(var0, var29);
             var8 ^= var24;
             var26 ^= var4;
             var4 = var4 << 11 | var4 >>> 53;
             var26 += var6;
-            var6 += AboutDialog(var0, var29 + 4);
+            var6 += readLong(var0, var29 + 4);
             var10 ^= var26;
             var4 ^= var6;
             var6 = var6 << 32 | var6 >>> 32;
             var4 += var8;
-            var8 += AboutDialog(var0, var29 + 8);
+            var8 += readLong(var0, var29 + 8);
             var12 ^= var4;
             var6 ^= var8;
             var8 = var8 << 43 | var8 >>> 21;
             var6 += var10;
-            var10 += AboutDialog(var0, var29 + 12);
+            var10 += readLong(var0, var29 + 12);
             var14 ^= var6;
             var8 ^= var10;
             var10 = var10 << 31 | var10 >>> 33;
             var8 += var12;
-            var12 += AboutDialog(var0, var29 + 16);
+            var12 += readLong(var0, var29 + 16);
             var16 ^= var8;
             var10 ^= var12;
             var12 = var12 << 17 | var12 >>> 47;
             var10 += var14;
-            var14 += AboutDialog(var0, var29 + 20);
+            var14 += readLong(var0, var29 + 20);
             var18 ^= var10;
             var12 ^= var14;
             var14 = var14 << 28 | var14 >>> 36;
             var12 += var16;
-            var16 += AboutDialog(var0, var29 + 24);
+            var16 += readLong(var0, var29 + 24);
             var20 ^= var12;
             var14 ^= var16;
             var16 = var16 << 39 | var16 >>> 25;
             var14 += var18;
-            var18 += AboutDialog(var0, var29 + 28);
+            var18 += readLong(var0, var29 + 28);
             var22 ^= var14;
             var16 ^= var18;
             var18 = var18 << 57 | var18 >>> 7;
             var16 += var20;
-            var20 += AboutDialog(var0, var29 + 32);
+            var20 += readLong(var0, var29 + 32);
             var24 ^= var16;
             var18 ^= var20;
             var20 = var20 << 55 | var20 >>> 9;
             var18 += var22;
-            var22 += AboutDialog(var0, var29 + 36);
+            var22 += readLong(var0, var29 + 36);
             var26 ^= var18;
             var20 ^= var22;
             var22 = var22 << 54 | var22 >>> 10;
             var20 += var24;
-            var24 += AboutDialog(var0, var29 + 40);
+            var24 += readLong(var0, var29 + 40);
             var4 ^= var20;
             var22 ^= var24;
             var24 = var24 << 22 | var24 >>> 42;
             var22 += var26;
-            var26 += AboutDialog(var0, var29 + 44);
+            var26 += readLong(var0, var29 + 44);
             var6 ^= var22;
             var24 ^= var26;
             var26 = var26 << 46 | var26 >>> 18;
@@ -637,7 +637,7 @@ public static long AboutDialogCloseListener(CharSequence var0, int var1, int var
          int var30 = var28 & 3;
          int var31 = var28 >> 2;
          if (var30 > 0) {
-            long var32 = AboutDialog(var0, var29 + (var31 << 2), var30);
+            long var32 = readLong(var0, var29 + (var31 << 2), var30);
             switch(var31) {
             case 0:
                var4 += var32;
@@ -679,27 +679,27 @@ public static long AboutDialogCloseListener(CharSequence var0, int var1, int var
 
          switch(var31) {
          case 11:
-            var24 += AboutDialog(var0, var29 + 40);
+            var24 += readLong(var0, var29 + 40);
          case 10:
-            var22 += AboutDialog(var0, var29 + 36);
+            var22 += readLong(var0, var29 + 36);
          case 9:
-            var20 += AboutDialog(var0, var29 + 32);
+            var20 += readLong(var0, var29 + 32);
          case 8:
-            var18 += AboutDialog(var0, var29 + 28);
+            var18 += readLong(var0, var29 + 28);
          case 7:
-            var16 += AboutDialog(var0, var29 + 24);
+            var16 += readLong(var0, var29 + 24);
          case 6:
-            var14 += AboutDialog(var0, var29 + 20);
+            var14 += readLong(var0, var29 + 20);
          case 5:
-            var12 += AboutDialog(var0, var29 + 16);
+            var12 += readLong(var0, var29 + 16);
          case 4:
-            var10 += AboutDialog(var0, var29 + 12);
+            var10 += readLong(var0, var29 + 12);
          case 3:
-            var8 += AboutDialog(var0, var29 + 8);
+            var8 += readLong(var0, var29 + 8);
          case 2:
-            var6 += AboutDialog(var0, var29 + 4);
+            var6 += readLong(var0, var29 + 4);
          case 1:
-            var4 += AboutDialog(var0, var29);
+            var4 += readChar4(var0, var29);
          default:
             var26 += (long)var28 << 1 << 56;
 
@@ -749,7 +749,7 @@ public static long AboutDialogCloseListener(CharSequence var0, int var1, int var
       }
    }
 
-   private static void AboutDialog(long[] var0, int var1, int var2, long[] var3) {
+   private static void mixLongs(long[] var0, int var1, int var2, long[] var3) {
       long var4 = var3[0];
       long var6 = var3[1];
       long var8 = -2401053088876216593L;
@@ -889,9 +889,9 @@ private static void AboutDialog(long[] var0, int var1, int var2, long[] var3) {
       var3[1] = var6;
    }
 
-   public static long AboutDialogCloseListener(long[] var0, int var1, int var2, long[] var3) {
+   public static long hashLongs(long[] var0, int var1, int var2, long[] var3) {
       if (var2 < 24) {
-         AboutDialog(var0, var1, var2, var3);
+         mixChars(var0, var1, var2, var3);
          return var3[0];
       } else {
          long var10;
@@ -1054,45 +1054,45 @@ public SpookyHash(long var1, long var3) {
       this.sH = var3;
    }
 
-   public static long AboutDialog(byte[] var0, long[] var1) {
-      return AboutDialogCloseListener((byte[])var0, 0, var0.length, var1);
+   public static long hashBytes(byte[] var0, long[] var1) {
+      return hashLongs((byte[])var0, 0, var0.length, var1);
    }
 
-   public long[] AccountPanel(byte[] var1, int var2, int var3) {
+   public long[] hashBytes(byte[] var1, int var2, int var3) {
       long[] var4 = new long[]{this.sG, this.sH};
-      AboutDialogCloseListener(var1, var2, var3, var4);
+      hashLongs(var1, var2, var3, var4);
       return var4;
    }
 
    public long[] j(byte[] var1) {
-      return this.AccountPanel(var1, 0, var1.length);
+      return this.hashBytes(var1, 0, var1.length);
    }
 
-   public static long AboutDialog(CharSequence var0, long[] var1) {
-      return AboutDialogCloseListener((CharSequence)var0, 0, var0.length(), var1);
+   public static long hashString(CharSequence var0, long[] var1) {
+      return hashString((CharSequence)var0, 0, var0.length(), var1);
    }
 
-   public long[] AboutDialogCloseListener(CharSequence var1, int var2, int var3) {
+   public long[] hashString(CharSequence var1, int var2, int var3) {
       long[] var4 = new long[]{this.sG, this.sH};
-      AboutDialogCloseListener(var1, var2, var3, var4);
+      hashString(var1, var2, var3, var4);
       return var4;
    }
 
-   public long[] AboutDialog(CharSequence var1) {
-      return this.AboutDialogCloseListener((CharSequence)var1, 0, var1.length());
+   public long[] hashString(CharSequence var1) {
+      return this.hashString((CharSequence)var1, 0, var1.length());
    }
 
-   public static long AboutDialog(long[] var0, long[] var1) {
-      return AboutDialogCloseListener((long[])var0, 0, var0.length, var1);
+   public static long hashLongs(long[] var0, long[] var1) {
+      return hashLongs((long[])var0, 0, var0.length, var1);
    }
 
-   public long[] AboutDialogCloseListener(long[] var1, int var2, int var3) {
+   public long[] hashLongs(long[] var1, int var2, int var3) {
       long[] var4 = new long[]{this.sG, this.sH};
-      AboutDialogCloseListener(var1, var2, var3, var4);
+      hashLongs(var1, var2, var3, var4);
       return var4;
    }
 
-   public long[] AboutDialogCloseListener(long[] var1) {
-      return this.AboutDialogCloseListener((long[])var1, 0, var1.length);
+   public long[] hashLongs(long[] var1) {
+      return this.hashLongs((long[])var1, 0, var1.length);
    }
 }
diff --git a/nomanssave/SquadronPanel.java b/nomanssave/SquadronPanel.java
index 03054cb..5515537 100644
--- a/nomanssave/SquadronPanel.java
+++ b/nomanssave/SquadronPanel.java
@@ -24,7 +24,7 @@ public class SquadronPanel extends SplitFormPanel {
       this.ib = new ec[0];
    }
 
-   void AboutDialog(SquadronPilot[] var1) {
+   void updateSquadron(SquadronPilot[] var1) {
       this.ic = var1;
 
       for(int var2 = var1.length; var2 < this.ib.length; ++var2) {
@@ -65,7 +65,7 @@ void AboutDialog(SquadronPilot[] var1) {
    }
 
    // $FF: synthetic method
-   static SquadronPilot[] AboutDialog(SquadronPanel var0) {
+   static SquadronPilot[] access$getPilots(SquadronPanel var0) {
       return var0.ic;
    }
 
diff --git a/nomanssave/SquadronPilot.java b/nomanssave/SquadronPilot.java
index 71453e3..d0d36c5 100644
--- a/nomanssave/SquadronPilot.java
+++ b/nomanssave/SquadronPilot.java
@@ -43,8 +43,8 @@ public NpcType ed() {
       return NpcType.as(this.rI.getValueAsString("NPCResource.Filename"));
    }
 
-   public void AboutDialog(NpcType var1) {
-      this.rI.AboutDialogCloseListener("NPCResource.Filename", (Object)var1.K());
+   public void setNpcType(NpcType var1) {
+      this.rI.setValueByPath("NPCResource.Filename", (Object)var1.K());
    }
 
    public String ee() {
@@ -68,8 +68,8 @@ public ShipType ef() {
       return ShipType.aw(this.rI.getValueAsString("ShipResource.Filename"));
    }
 
-   public void AboutDialog(ShipType var1) {
-      this.rI.AboutDialogCloseListener("ShipResource.Filename", (Object)var1.K());
+   public void setShipType(ShipType var1) {
+      this.rI.setValueByPath("ShipResource.Filename", (Object)var1.K());
    }
 
    public String eg() {
@@ -94,7 +94,7 @@ public int eh() {
    }
 
    public void aI(int var1) {
-      this.rI.AboutDialogCloseListener("PilotRank", (Object)var1);
+      this.rI.setValueByPath("PilotRank", (Object)var1);
    }
 
    public String toString() {
diff --git a/nomanssave/Starship.java b/nomanssave/Starship.java
index ad4d95c..cb36456 100644
--- a/nomanssave/Starship.java
+++ b/nomanssave/Starship.java
@@ -31,7 +31,7 @@ public static Starship[] fromPlayerData(JsonObject var0) {
       }
    }
 
-   public static Starship AccountPanel(JsonObject var0, File var1) {
+   public static Starship importFromFile(JsonObject var0, File var1) {
       JsonArray var2 = var0.d("ShipOwnership");
       if (var2 != null && var2.size() != 0) {
          int var3 = -1;
@@ -95,7 +95,7 @@ public static Starship AccountPanel(JsonObject var0, File var1) {
       }
    }
 
-   private static Function AboutDialog(Starship var0, String[] var1) {
+   private static Function buildFieldAccessor(Starship var0, String[] var1) {
       return (var2) -> {
          String var3 = var0.getName();
          if (var3 == null || var3.length() == 0) {
@@ -133,19 +133,19 @@ private Starship(int var1, JsonObject var2, JsonObject var3, JsonObject var4, Js
       }
 
       ArrayList var15 = new ArrayList();
-      var15.add(new gI(this, AboutDialog(this, var6), var3, 0, var10, var11, false, true, var14, var1));
+      var15.add(new gI(this, buildFieldAccessor(this, var6), var3, 0, var10, var11, false, true, var14, var1));
       if (var4 != null) {
-         var15.add(new gJ(this, AboutDialog(this, var7), var4, 0, var12, var13, true, true, var1));
+         var15.add(new gJ(this, buildFieldAccessor(this, var7), var4, 0, var12, var13, true, true, var1));
       }
 
       if (var5 != null) {
-         var15.add(new gK(this, AboutDialog(this, var8), var5, var9, 8, 6, false, true, var1));
+         var15.add(new gK(this, buildFieldAccessor(this, var8), var5, var9, 8, 6, false, true, var1));
       }
 
       this.CoordinateTransform = Collections.unmodifiableList(var15);
    }
 
-   public void AboutDialog(File var1, boolean var2) {
+   public void exportToFile(File var1, boolean var2) {
       Throwable var3 = null;
       Object var4 = null;
 
@@ -204,7 +204,7 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.rp.AboutDialogCloseListener("Name", (Object)var1);
+      this.rp.setValueByPath("Name", (Object)var1);
    }
 
    public boolean dZ() {
@@ -221,7 +221,7 @@ public String cT() {
    }
 
    public void ag(String var1) {
-      this.rp.AboutDialogCloseListener("Resource.Filename", (Object)var1);
+      this.rp.setValueByPath("Resource.Filename", (Object)var1);
       ShipType var2 = ShipType.aw(var1);
       this.CoordinateTransform.stream().forEach((var1x) -> {
          var1x.az(var2 == null ? 4 : var2.ea());
@@ -248,7 +248,7 @@ public void aa(String var1) {
    }
 
    public void cm() {
-      this.rp.AboutDialogCloseListener("Resource.Filename", (Object)"");
+      this.rp.setValueByPath("Resource.Filename", (Object)"");
       this.rp.d("Resource.Seed").AboutDialog(0, Boolean.FALSE);
       this.rp.d("Resource.Seed").AboutDialog(1, "0x0");
    }
@@ -258,15 +258,15 @@ public String LineNumberPanel() {
    }
 
    public void aj(String var1) {
-      this.rp.AboutDialogCloseListener("Inventory.Class.InventoryClass", (Object)var1);
+      this.rp.setValueByPath("Inventory.Class.InventoryClass", (Object)var1);
       JsonObject var2 = this.rp.H("Inventory_TechOnly.Class");
       if (var2 != null) {
-         var2.AboutDialogCloseListener("InventoryClass", (Object)var1);
+         var2.setValueByPath("InventoryClass", (Object)var1);
       }
 
       var2 = this.rp.H("Inventory_Cargo.Class");
       if (var2 != null) {
-         var2.AboutDialogCloseListener("InventoryClass", (Object)var1);
+         var2.setValueByPath("InventoryClass", (Object)var1);
       }
 
    }
@@ -311,7 +311,7 @@ public double cX() {
       return this.ak("^SHIP_HYPERDRIVE");
    }
 
-   public void AboutDialog(double var1) {
+   public void setHyperdrive(double var1) {
       this.d("^SHIP_HYPERDRIVE", var1);
    }
 
@@ -334,7 +334,7 @@ public String toString() {
    }
 
    // $FF: synthetic method
-   static int AboutDialogCloseListener(Starship var0) {
+   static int access$getIndex(Starship var0) {
       return var0.ea();
    }
 }
diff --git a/nomanssave/SteamSaveFileMetadata.java b/nomanssave/SteamSaveFileMetadata.java
index b854176..2cc57fc 100644
--- a/nomanssave/SteamSaveFileMetadata.java
+++ b/nomanssave/SteamSaveFileMetadata.java
@@ -48,7 +48,7 @@ class SteamSaveFileMetadata {
 
          int var8 = this.mx.cj();
          if (var8 != 0) {
-            Logger.info("  TotalPlayTime: " + SaveLocation.AccountPanel((long)var8));
+            Logger.info("  TotalPlayTime: " + SaveLocation.formatPlayTime((long)var8));
          }
       } else {
          Logger.info("Creating new metadata for " + var2);
@@ -65,7 +65,7 @@ public long lastModified() {
       return (new File(SteamSaveLocation.AboutDialog(this.mt), "mf_" + this.filename)).lastModified();
    }
 
-   JsonObject AboutDialog(eG param1) {
+   JsonObject readSaveFile(eG param1) {
       // $FF: Couldn't be decompiled
    }
 
@@ -99,7 +99,7 @@ byte[] ah(int var1) {
       }
    }
 
-   void AboutDialog(String var1, GameMode var2, String var3, String var4) {
+   void writeSaveFile(String var1, GameMode var2, String var3, String var4) {
       File var5 = new File(SteamSaveLocation.AboutDialog(this.mt), "mf_" + this.filename);
       File var6 = new File(SteamSaveLocation.AboutDialog(this.mt), this.filename);
       Properties var7 = new Properties();
@@ -160,7 +160,7 @@ void AboutDialog(String var1, GameMode var2, String var3, String var4) {
       var9.setLastModified(var5.lastModified());
    }
 
-   void AboutDialog(JsonObject var1, boolean var2) {
+   void updateSaveData(JsonObject var1, boolean var2) {
       ByteArrayOutputStream var3 = new ByteArrayOutputStream();
       Throwable var4 = null;
       Object var5 = null;
diff --git a/nomanssave/SteamSaveLocation.java b/nomanssave/SteamSaveLocation.java
index 6d29c0b..43a45fa 100644
--- a/nomanssave/SteamSaveLocation.java
+++ b/nomanssave/SteamSaveLocation.java
@@ -112,7 +112,7 @@ public boolean bW() {
       return true;
    }
 
-   public String AboutDialog(int var1, JsonObject var2) {
+   public String renameFrigate(int var1, JsonObject var2) {
       if (this.ms[var1 * 2] != null) {
          this.ms[var1 * 2].cm();
          this.ms[var1 * 2] = null;
@@ -127,7 +127,7 @@ public String AboutDialog(int var1, JsonObject var2) {
       return this.ms[var1 * 2].filename;
    }
 
-   private static byte[] AboutDialog(long[] var0, int var1, int var2) {
+   private static byte[] toLongBytes(long[] var0, int var1, int var2) {
       byte[] var3 = new byte[var2 * 4];
 
       for(int var4 = 0; var4 < var2; ++var4) {
@@ -140,28 +140,28 @@ private static byte[] AboutDialog(long[] var0, int var1, int var2) {
       return var3;
    }
 
-   private static byte[] AccountPanel(byte[] var0, byte[] var1) {
+   private static byte[] xorBytes(byte[] var0, byte[] var1) {
       ByteArrayOutputStream var2 = new ByteArrayOutputStream();
       var2.write(var0, 0, var0.length);
       var2.write(var1, 0, var1.length);
       long[] var3 = new long[]{96176015842230784L, -8446744073709551617L};
-      SpookyHash.AboutDialog(var2.toByteArray(), var3);
+      SpookyHash.hashBytes(var2.toByteArray(), var3);
       long[] var4 = new long[]{var3[0] & 4294967295L, var3[0] >>> 32 & 4294967295L, var3[1] & 4294967295L, var3[1] >>> 32 & 4294967295L};
-      return AboutDialog(var4, 0, 4);
+      return toLongBytes(var4, 0, 4);
    }
 
    // $FF: synthetic method
-   static File AboutDialog(SteamSaveLocation var0) {
+   static File access$getDirectory(SteamSaveLocation var0) {
       return var0.lX;
    }
 
    // $FF: synthetic method
    static byte[] d(byte[] var0, byte[] var1) {
-      return AccountPanel(var0, var1);
+      return xorBytes(var0, var1);
    }
 
    // $FF: synthetic method
-   static fM[] AboutDialogCloseListener(SteamSaveLocation var0) {
+   static fM[] access$getSaveFiles(SteamSaveLocation var0) {
       return var0.ms;
    }
 
diff --git a/nomanssave/UpdateCheckThread.java b/nomanssave/UpdateCheckThread.java
index 1feba14..125273a 100644
--- a/nomanssave/UpdateCheckThread.java
+++ b/nomanssave/UpdateCheckThread.java
@@ -55,7 +55,7 @@ public void run() {
    }
 
    // $FF: synthetic method
-   static Application AboutDialog(UpdateCheckThread var0) {
+   static Application access$getApplication(UpdateCheckThread var0) {
       return var0.aZ;
    }
 }
diff --git a/nomanssave/Vehicle.java b/nomanssave/Vehicle.java
index 2f81525..ce677a5 100644
--- a/nomanssave/Vehicle.java
+++ b/nomanssave/Vehicle.java
@@ -35,7 +35,7 @@ public static Vehicle[] fromPlayerData(JsonObject var0) {
       }
    }
 
-   private static Function AboutDialog(Vehicle var0, String var1) {
+   private static Function buildFieldAccessor(Vehicle var0, String var1) {
       return (var2) -> {
          return new String[]{var0.getType(), var1};
       };
@@ -70,9 +70,9 @@ private Vehicle(int var1, JsonObject var2, JsonObject var3, JsonObject var4) {
       }
 
       ArrayList var12 = new ArrayList();
-      var12.add(new gP(this, AboutDialog(this, var11), var3, 0, var7, var8, false, false, false, false, var6, var5));
+      var12.add(new gP(this, buildFieldAccessor(this, var11), var3, 0, var7, var8, false, false, false, false, var6, var5));
       if (var4 != null) {
-         var12.add(new Inventory(AboutDialog(this, "Technology"), var4, var5, var9, var10, true, false, false, false));
+         var12.add(new Inventory(buildFieldAccessor(this, "Technology"), var4, var5, var9, var10, true, false, false, false));
       }
 
       this.CoordinateTransform = Collections.unmodifiableList(var12);
@@ -84,14 +84,14 @@ private Vehicle(JsonObject var1, JsonObject var2) {
       var2.AboutDialog((var1x, var2x, var3x) -> {
          if ("ValidSlotIndices".equals(var1x) && var3x instanceof JsonArray) {
             int var4 = ((JsonArray)var3x).size();
-            var1.AboutDialogCloseListener("Slots", (Object)var4);
+            var1.setValueByPath("Slots", (Object)var4);
          }
 
       });
       byte var3 = 8;
       byte var4 = 6;
       ArrayList var5 = new ArrayList();
-      var5.add(new Inventory(AboutDialog(this, "Cold Storage"), var2, 2048, var3, var4, false, false, true, false));
+      var5.add(new Inventory(buildFieldAccessor(this, "Cold Storage"), var2, 2048, var3, var4, false, false, true, false));
       this.CoordinateTransform = Collections.unmodifiableList(var5);
    }
 
diff --git a/nomanssave/VehiclesPanel.java b/nomanssave/VehiclesPanel.java
index fb04791..44353df 100644
--- a/nomanssave/VehiclesPanel.java
+++ b/nomanssave/VehiclesPanel.java
@@ -9,9 +9,9 @@ public class VehiclesPanel extends SplitFormPanel {
 
    VehiclesPanel(Application var1) {
       this.iw.setModel(new eq(this));
-      this.AboutDialog("Vehicle", true, this.iw);
+      this.addRow("Vehicle", true, this.iw);
       this.ix = new InventoryPanel(var1);
-      this.AboutDialogCloseListener(this.ix);
+      this.setRightComponent(this.ix);
    }
 
    void AppStartupRunnable() {
@@ -30,15 +30,15 @@ void ShowWarningRunnable() {
       this.ix.ShowWarningRunnable();
    }
 
-   void AboutDialog(Inventory var1) {
-      this.ix.AboutDialog(var1);
+   void updateInventory(Inventory var1) {
+      this.ix.updateInventory(var1);
    }
 
    Vehicle[] aT() {
       return this.iy;
    }
 
-   void AboutDialog(Vehicle[] var1) {
+   void updateVehicles(Vehicle[] var1) {
       if (var1.length == 0) {
          this.iy = new Vehicle[0];
          this.iw.setSelectedIndex(-1);
@@ -51,12 +51,12 @@ void AboutDialog(Vehicle[] var1) {
    }
 
    // $FF: synthetic method
-   static Vehicle[] AboutDialog(VehiclesPanel var0) {
+   static Vehicle[] access$getVehicles(VehiclesPanel var0) {
       return var0.iy;
    }
 
    // $FF: synthetic method
-   static InventoryPanel AboutDialogCloseListener(VehiclesPanel var0) {
+   static InventoryPanel access$getInventoryPanel(VehiclesPanel var0) {
       return var0.ix;
    }
 }
diff --git a/nomanssave/XboxContainerWriter.java b/nomanssave/XboxContainerWriter.java
index a5d9f3b..69a8251 100644
--- a/nomanssave/XboxContainerWriter.java
+++ b/nomanssave/XboxContainerWriter.java
@@ -23,12 +23,12 @@ abstract class XboxContainerWriter {
 
    XboxContainerWriter(XboxSaveLocation var1, fV var2) {
       this.mN = var1;
-      int var3 = XboxSaveLocation.AccountPanel(var1).size();
+      int var3 = XboxSaveLocation.access$getEntries(var1).size();
 
-      for(int var4 = 0; var4 < XboxSaveLocation.AccountPanel(var1).size(); ++var4) {
-         int var5 = ((fW)XboxSaveLocation.AccountPanel(var1).get(var4)).name.compareTo(var2.mO.name);
+      for(int var4 = 0; var4 < XboxSaveLocation.access$getEntries(var1).size(); ++var4) {
+         int var5 = ((fW)XboxSaveLocation.access$getEntries(var1).get(var4)).name.compareTo(var2.mO.name);
          if (var5 == 0) {
-            fW var6 = (fW)XboxSaveLocation.AccountPanel(var1).remove(var4);
+            fW var6 = (fW)XboxSaveLocation.access$getEntries(var1).remove(var4);
             XboxSaveLocation.i(new File(XboxSaveLocation.d(var1), var6.mU));
          }
 
@@ -54,7 +54,7 @@ abstract class XboxContainerWriter {
             var10.close();
          }
 
-         XboxSaveLocation.AccountPanel(var1).add(var3, this.mO);
+         XboxSaveLocation.access$getEntries(var1).add(var3, this.mO);
       }
    }
 
@@ -79,9 +79,9 @@ abstract class XboxContainerWriter {
             for(int var9 = 0; var9 < var8; ++var9) {
                String var10 = gc.d(var6);
                Logger.debug("  name: " + var10);
-               String var11 = gc.AboutDialog(var6);
+               String var11 = gc.readGuid(var6);
                Logger.debug("  filename: " + var11);
-               String var12 = gc.AboutDialog(var6);
+               String var12 = gc.readGuid(var6);
                if (!var11.equals(var12)) {
                   Logger.debug("  filename2: " + var12);
                }
@@ -158,7 +158,7 @@ private OutputStream getOutputStream() {
       }
    }
 
-   JsonObject AboutDialog(eG var1) {
+   JsonObject readJsonObject(eG var1) {
       Throwable var2 = null;
       Object var3 = null;
 
@@ -170,7 +170,7 @@ JsonObject AboutDialog(eG var1) {
             JsonObject var17;
             boolean var10001;
             try {
-               var17 = var4.AboutDialog(var1);
+               var17 = var4.readJsonObject(var1);
             } catch (Throwable var15) {
                var10000 = var15;
                var10001 = false;
@@ -310,7 +310,7 @@ void h(JsonObject var1) {
       XboxSaveLocation.e(this.mN);
    }
 
-   void AboutDialog(String var1, GameMode var2) {
+   void writeHeader(String var1, GameMode var2) {
       Properties var3 = new Properties();
       var3.setProperty("MetaFile", this.mZ.getName());
       var3.setProperty("DataFile", this.mY.getName());
diff --git a/nomanssave/XboxSaveLocation.java b/nomanssave/XboxSaveLocation.java
index 928a007..598886d 100644
--- a/nomanssave/XboxSaveLocation.java
+++ b/nomanssave/XboxSaveLocation.java
@@ -89,7 +89,7 @@ private void cr() {
             Logger.debug("  unknown1: " + this.lL);
          }
 
-         this.name = gc.AccountPanel(var1);
+         this.name = gc.readUtf16String(var1);
          Logger.debug("  name: " + this.name);
          this.lM = hk.readInt(var1);
          if (this.lM != 0) {
@@ -106,7 +106,7 @@ private void cr() {
             Logger.debug("  unknown4: " + this.lS);
          }
 
-         this.mF = gc.AccountPanel(var1);
+         this.mF = gc.readUtf16String(var1);
          Logger.debug("  appid: " + this.mF);
          this.mG = hk.readInt(var1);
          if (this.mG != 0) {
@@ -137,16 +137,16 @@ private void cs() {
       FileOutputStream var1 = new FileOutputStream(new File(this.lX, "containers.index"));
 
       try {
-         hk.AboutDialog(var1, this.header);
-         hk.AboutDialog(var1, this.mI.size());
-         hk.AboutDialog(var1, this.lL);
-         gc.AboutDialogCloseListener(var1, this.name);
-         hk.AboutDialog(var1, this.lM);
-         hk.AboutDialog(var1, this.lR);
-         hk.AboutDialog(var1, this.lS);
-         gc.AboutDialogCloseListener(var1, this.mF);
-         hk.AboutDialog(var1, this.mG);
-         hk.AboutDialog(var1, this.mH);
+         hk.writeInt(var1, this.header);
+         hk.writeInt(var1, this.mI.size());
+         hk.writeInt(var1, this.lL);
+         gc.writeUtf16String(var1, this.name);
+         hk.writeInt(var1, this.lM);
+         hk.writeInt(var1, this.lR);
+         hk.writeInt(var1, this.lS);
+         gc.writeUtf16String(var1, this.mF);
+         hk.writeInt(var1, this.mG);
+         hk.writeInt(var1, this.mH);
          Iterator var3 = this.mI.iterator();
 
          while(var3.hasNext()) {
@@ -234,7 +234,7 @@ private static boolean h(File var0) {
       return var0.delete();
    }
 
-   private static InputStream AboutDialog(InputStream var0, int var1) {
+   private static InputStream readBytes(InputStream var0, int var1) {
       try {
          boolean var2 = true;
          if (!((InputStream)var0).markSupported()) {
@@ -277,12 +277,12 @@ private static InputStream AboutDialog(InputStream var0, int var1) {
    }
 
    // $FF: synthetic method
-   static String AboutDialog(XboxSaveLocation var0) {
+   static String access$getDirectory(XboxSaveLocation var0) {
       return var0.ct();
    }
 
    // $FF: synthetic method
-   static fY[] AboutDialogCloseListener(XboxSaveLocation var0) {
+   static fY[] access$getSaveFiles(XboxSaveLocation var0) {
       return var0.mE;
    }
 
@@ -302,7 +302,7 @@ static int ao(int var0) {
    }
 
    // $FF: synthetic method
-   static List AccountPanel(XboxSaveLocation var0) {
+   static List access$getEntries(XboxSaveLocation var0) {
       return var0.mI;
    }
 
@@ -317,13 +317,13 @@ static boolean i(File var0) {
    }
 
    // $FF: synthetic method
-   static fW AboutDialog(XboxSaveLocation var0, String var1) {
+   static fW access$findEntry(XboxSaveLocation var0, String var1) {
       return var0.Z(var1);
    }
 
    // $FF: synthetic method
-   static InputStream AboutDialogCloseListener(InputStream var0, int var1) {
-      return AboutDialog(var0, var1);
+   static InputStream access$readBytes(InputStream var0, int var1) {
+      return readBytes(var0, var1);
    }
 
    // $FF: synthetic method
diff --git a/nomanssave/aD.java b/nomanssave/aD.java
index ec62cf8..ee0f654 100644
--- a/nomanssave/aD.java
+++ b/nomanssave/aD.java
@@ -67,17 +67,17 @@ public static boolean d(Container var0) {
    }
 
    // $FF: synthetic method
-   static JComboBox AboutDialog(aD var0) {
+   static JComboBox access$getComboBox(aD var0) {
       return var0.cw;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(aD var0, boolean var1) {
+   static void access$setFlag(aD var0, boolean var1) {
       var0.JsonEditorDialog = var1;
    }
 
    // $FF: synthetic method
-   static JTextField AboutDialogCloseListener(aD var0) {
+   static JTextField access$getTextField(aD var0) {
       return var0.cx;
    }
 }
diff --git a/nomanssave/aF.java b/nomanssave/aF.java
index 7b54642..fa948ea 100644
--- a/nomanssave/aF.java
+++ b/nomanssave/aF.java
@@ -17,22 +17,22 @@ public void actionPerformed(ActionEvent var1) {
       aI var3 = (aI)Stream.of(aI.values()).filter((var1x) -> {
          return var1x.name().equalsIgnoreCase(var2);
       }).findFirst().orElse(aI.cN);
-      aI var4 = (aI)aD.AboutDialog(this.cB).getSelectedItem();
-      aD.AboutDialog(this.cB, false);
+      aI var4 = (aI)aD.access$getComboBox(this.cB).getSelectedItem();
+      aD.access$setFlag(this.cB, false);
       if (var4 == null) {
          if (var3 != null) {
             AppSettings.setProperty("LookAndFeel", (String)null);
-            aD.AboutDialog(this.cB, true);
+            aD.access$setFlag(this.cB, true);
          }
       } else if (var3 == null || var3 != var4) {
          AppSettings.setProperty("LookAndFeel", var4.name());
-         aD.AboutDialog(this.cB, true);
+         aD.access$setFlag(this.cB, true);
       }
 
-      double var5 = Double.parseDouble(aD.AboutDialogCloseListener(this.cB).getText());
+      double var5 = Double.parseDouble(aD.access$getTextField(this.cB).getText());
       if (var5 != AppSettings.AboutDialog("InventoryScaling", 1.0D)) {
-         AppSettings.AboutDialogCloseListener("InventoryScaling", var5);
-         aD.AboutDialog(this.cB, true);
+         AppSettings.setValueByPath("InventoryScaling", var5);
+         aD.access$setFlag(this.cB, true);
       }
 
       this.cB.setVisible(false);
diff --git a/nomanssave/aK.java b/nomanssave/aK.java
index 8ad7ff3..fad0753 100644
--- a/nomanssave/aK.java
+++ b/nomanssave/aK.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = ExosuitPanel.AboutDialog(this.MultitoolPanel).dM();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 1, 200);
+            int var3 = hf.parseIntClamped(var1, 1, 200);
             if (var3 != var2) {
                ExosuitPanel.AboutDialog(this.MultitoolPanel).aB(var3);
             }
diff --git a/nomanssave/aL.java b/nomanssave/aL.java
index cfcd321..9975d80 100644
--- a/nomanssave/aL.java
+++ b/nomanssave/aL.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = ExosuitPanel.AboutDialog(this.MultitoolPanel).ShipsPanel();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 0, 100);
+            int var3 = hf.parseIntClamped(var1, 0, 100);
             if (var3 != var2) {
                ExosuitPanel.AboutDialog(this.MultitoolPanel).aC(var3);
             }
diff --git a/nomanssave/aM.java b/nomanssave/aM.java
index 70c4f3c..faa4561 100644
--- a/nomanssave/aM.java
+++ b/nomanssave/aM.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = ExosuitPanel.AboutDialog(this.MultitoolPanel).dO();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 0, 100);
+            int var3 = hf.parseIntClamped(var1, 0, 100);
             if (var3 != var2) {
                ExosuitPanel.AboutDialog(this.MultitoolPanel).aD(var3);
             }
diff --git a/nomanssave/aN.java b/nomanssave/aN.java
index b70f168..e7fe2b5 100644
--- a/nomanssave/aN.java
+++ b/nomanssave/aN.java
@@ -18,7 +18,7 @@ protected String g(String var1) {
          long var2 = ExosuitPanel.AboutDialog(this.MultitoolPanel).dJ();
 
          try {
-            long var4 = hf.AboutDialog(var1, 0L, 4294967295L);
+            long var4 = hf.parseLongClamped(var1, 0L, 4294967295L);
             if (var4 != var2) {
                ExosuitPanel.AboutDialog(this.MultitoolPanel).e(var4);
                this.bv.C();
diff --git a/nomanssave/aO.java b/nomanssave/aO.java
index a61ebf3..a8ab3cf 100644
--- a/nomanssave/aO.java
+++ b/nomanssave/aO.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          long var2 = ExosuitPanel.AboutDialog(this.MultitoolPanel).dK();
 
          try {
-            long var4 = hf.AboutDialog(var1, 0L, 4294967295L);
+            long var4 = hf.parseLongClamped(var1, 0L, 4294967295L);
             if (var4 != var2) {
                ExosuitPanel.AboutDialog(this.MultitoolPanel).f(var4);
             }
diff --git a/nomanssave/aP.java b/nomanssave/aP.java
index 7e075c3..1772d32 100644
--- a/nomanssave/aP.java
+++ b/nomanssave/aP.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          long var2 = ExosuitPanel.AboutDialog(this.MultitoolPanel).dL();
 
          try {
-            long var4 = hf.AboutDialog(var1, 0L, 4294967295L);
+            long var4 = hf.parseLongClamped(var1, 0L, 4294967295L);
             if (var4 != var2) {
                ExosuitPanel.AboutDialog(this.MultitoolPanel).g(var4);
             }
diff --git a/nomanssave/aQ.java b/nomanssave/aQ.java
index 4c45390..0d10db5 100644
--- a/nomanssave/aQ.java
+++ b/nomanssave/aQ.java
@@ -63,7 +63,7 @@ private aQ(Frame var1) {
       this.pack();
    }
 
-   private Dimension AboutDialog(Dimension var1, Dimension var2, Dimension var3) {
+   private Dimension showDialog(Dimension var1, Dimension var2, Dimension var3) {
       this.dk = var1;
       this.dl = var2;
       this.dm = var3;
@@ -75,27 +75,27 @@ private Dimension AboutDialog(Dimension var1, Dimension var2, Dimension var3) {
       return this.dn;
    }
 
-   public static Dimension AboutDialog(Container var0, Dimension var1, Dimension var2, Dimension var3) {
+   public static Dimension show(Container var0, Dimension var1, Dimension var2, Dimension var3) {
       if (dq == null) {
          Frame var4 = JOptionPane.getFrameForComponent(var0);
          dq = new aQ(var4);
       }
 
-      return dq.AboutDialog(var1, var2, var3);
+      return dq.showDialog(var1, var2, var3);
    }
 
    // $FF: synthetic method
-   static JTextField AboutDialog(aQ var0) {
+   static JTextField access$getTextField(aQ var0) {
       return var0.do;
    }
 
    // $FF: synthetic method
-   static Dimension AboutDialogCloseListener(aQ var0) {
+   static Dimension access$getDimension(aQ var0) {
       return var0.dk;
    }
 
    // $FF: synthetic method
-   static Dimension AccountPanel(aQ var0) {
+   static Dimension access$getMinDimension(aQ var0) {
       return var0.dl;
    }
 
@@ -110,7 +110,7 @@ static JTextField e(aQ var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(aQ var0, Dimension var1) {
+   static void access$setDimension(aQ var0, Dimension var1) {
       var0.dn = var1;
    }
 }
diff --git a/nomanssave/aR.java b/nomanssave/aR.java
index 7034d8a..cee1a1a 100644
--- a/nomanssave/aR.java
+++ b/nomanssave/aR.java
@@ -17,18 +17,18 @@ public void focusGained(FocusEvent var1) {
    public void focusLost(FocusEvent var1) {
       int var2;
       try {
-         var2 = Integer.parseInt(aQ.AboutDialog(this.dr).getText());
-         if (var2 != aQ.AboutDialogCloseListener(this.dr).width) {
-            if (var2 < aQ.AccountPanel(this.dr).width) {
-               var2 = aQ.AccountPanel(this.dr).width;
+         var2 = Integer.parseInt(aQ.access$getTextField(this.dr).getText());
+         if (var2 != aQ.access$getDimension(this.dr).width) {
+            if (var2 < aQ.access$getMinDimension(this.dr).width) {
+               var2 = aQ.access$getMinDimension(this.dr).width;
             } else if (var2 > aQ.d(this.dr).width && !en.aS()) {
                var2 = aQ.d(this.dr).width;
             }
          }
       } catch (RuntimeException var4) {
-         var2 = aQ.AboutDialogCloseListener(this.dr).width;
+         var2 = aQ.access$getDimension(this.dr).width;
       }
 
-      aQ.AboutDialog(this.dr).setText(Integer.toString(var2));
+      aQ.access$getTextField(this.dr).setText(Integer.toString(var2));
    }
 }
diff --git a/nomanssave/aS.java b/nomanssave/aS.java
index d684d69..6b7833b 100644
--- a/nomanssave/aS.java
+++ b/nomanssave/aS.java
@@ -18,15 +18,15 @@ public void focusLost(FocusEvent var1) {
       int var2;
       try {
          var2 = Integer.parseInt(aQ.e(this.dr).getText());
-         if (var2 != aQ.AboutDialogCloseListener(this.dr).height) {
-            if (var2 < aQ.AccountPanel(this.dr).height) {
-               var2 = aQ.AccountPanel(this.dr).height;
+         if (var2 != aQ.access$getDimension(this.dr).height) {
+            if (var2 < aQ.access$getMinDimension(this.dr).height) {
+               var2 = aQ.access$getMinDimension(this.dr).height;
             } else if (var2 > aQ.d(this.dr).height && !en.aS()) {
                var2 = aQ.d(this.dr).height;
             }
          }
       } catch (RuntimeException var4) {
-         var2 = aQ.AboutDialogCloseListener(this.dr).height;
+         var2 = aQ.access$getDimension(this.dr).height;
       }
 
       aQ.e(this.dr).setText(Integer.toString(var2));
diff --git a/nomanssave/aT.java b/nomanssave/aT.java
index c329297..2bf0b11 100644
--- a/nomanssave/aT.java
+++ b/nomanssave/aT.java
@@ -13,7 +13,7 @@ class aT implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      aQ.AboutDialog(this.dr, new Dimension(Integer.parseInt(aQ.AboutDialog(this.dr).getText()), Integer.parseInt(aQ.e(this.dr).getText())));
+      aQ.access$setDimension(this.dr, new Dimension(Integer.parseInt(aQ.access$getTextField(this.dr).getText()), Integer.parseInt(aQ.e(this.dr).getText())));
       this.dr.setVisible(false);
    }
 }
diff --git a/nomanssave/aW.java b/nomanssave/aW.java
index b01f097..f85b1d5 100644
--- a/nomanssave/aW.java
+++ b/nomanssave/aW.java
@@ -81,7 +81,7 @@ private aW(JsonEditorDialog var1) {
       this.pack();
    }
 
-   public static void AboutDialog(JsonEditorDialog var0, String var1) {
+   public static void show(JsonEditorDialog var0, String var1) {
       if (dx == null) {
          dx = new aW(var0);
       }
@@ -98,17 +98,17 @@ public static void AboutDialog(JsonEditorDialog var0, String var1) {
    }
 
    // $FF: synthetic method
-   static JTextField AboutDialog(aW var0) {
+   static JTextField access$getSearchField(aW var0) {
       return var0.ds;
    }
 
    // $FF: synthetic method
-   static JRadioButton AboutDialogCloseListener(aW var0) {
+   static JRadioButton access$getDirectionButton(aW var0) {
       return var0.dw;
    }
 
    // $FF: synthetic method
-   static JCheckBox AccountPanel(aW var0) {
+   static JCheckBox access$getCaseSensitiveCheckbox(aW var0) {
       return var0.dt;
    }
 
diff --git a/nomanssave/aX.java b/nomanssave/aX.java
index a347837..3ff4b3d 100644
--- a/nomanssave/aX.java
+++ b/nomanssave/aX.java
@@ -15,9 +15,9 @@ class aX implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      String var2 = aW.AboutDialog(this.dy).getText();
+      String var2 = aW.access$getSearchField(this.dy).getText();
       if (var2.length() > 0) {
-         this.dz.AboutDialog(var2, aW.AboutDialogCloseListener(this.dy).isSelected(), aW.AccountPanel(this.dy).isSelected(), aW.d(this.dy).isSelected());
+         this.dz.configure(var2, aW.access$getDirectionButton(this.dy).isSelected(), aW.access$getCaseSensitiveCheckbox(this.dy).isSelected(), aW.d(this.dy).isSelected());
       }
 
    }
diff --git a/nomanssave/aj.java b/nomanssave/aj.java
index f93d272..21dfb44 100644
--- a/nomanssave/aj.java
+++ b/nomanssave/aj.java
@@ -123,7 +123,7 @@ private void P() {
 
    }
 
-   private GalacticAddress AboutDialog(GalacticAddress var1) {
+   private GalacticAddress showDialog(GalacticAddress var1) {
       this.cc = var1;
       this.m.setText("");
       this.P();
@@ -133,32 +133,32 @@ private GalacticAddress AboutDialog(GalacticAddress var1) {
       return this.cd ? this.cc : null;
    }
 
-   public static GalacticAddress AboutDialog(Container var0, GalacticAddress var1) {
+   public static GalacticAddress show(Container var0, GalacticAddress var1) {
       if (cf == null) {
          Frame var2 = JOptionPane.getFrameForComponent(var0);
          cf = new aj(var2);
       }
 
-      return cf.AboutDialog(var1);
+      return cf.showDialog(var1);
    }
 
    // $FF: synthetic method
-   static JTextField AboutDialog(aj var0) {
+   static JTextField access$getTextField(aj var0) {
       return var0.m;
    }
 
    // $FF: synthetic method
-   static JComboBox AboutDialogCloseListener(aj var0) {
+   static JComboBox access$getGalaxyComboBox(aj var0) {
       return var0.bX;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(aj var0, GalacticAddress var1) {
+   static void access$setAddress(aj var0, GalacticAddress var1) {
       var0.cc = var1;
    }
 
    // $FF: synthetic method
-   static void AccountPanel(aj var0) {
+   static void access$clearAddress(aj var0) {
       var0.P();
    }
 
@@ -168,7 +168,7 @@ static List Q() {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(aj var0, boolean var1) {
+   static void access$setEditing(aj var0, boolean var1) {
       var0.cd = var1;
    }
 }
diff --git a/nomanssave/ak.java b/nomanssave/ak.java
index 77d9fb7..cc2bebe 100644
--- a/nomanssave/ak.java
+++ b/nomanssave/ak.java
@@ -15,8 +15,8 @@ class ak implements ActionListener {
 
    public void actionPerformed(ActionEvent var1) {
       try {
-         aj.AboutDialog(this.ItemDetailsDialog, GalacticAddress.e(aj.AboutDialog(this.ItemDetailsDialog).getText().trim(), aj.AboutDialogCloseListener(this.ItemDetailsDialog).getSelectedIndex()));
-         aj.AccountPanel(this.ItemDetailsDialog);
+         aj.access$setAddress(this.ItemDetailsDialog, GalacticAddress.e(aj.access$getTextField(this.ItemDetailsDialog).getText().trim(), aj.access$getGalaxyComboBox(this.ItemDetailsDialog).getSelectedIndex()));
+         aj.access$clearAddress(this.ItemDetailsDialog);
       } catch (RuntimeException var3) {
          JOptionPane.showOptionDialog(this.ItemDetailsDialog, "Invalid address value, please try again.", "Error", 0, 0, (Icon)null, new Object[]{"Cancel"}, (Object)null);
       }
diff --git a/nomanssave/am.java b/nomanssave/am.java
index 4c66bce..78773ea 100644
--- a/nomanssave/am.java
+++ b/nomanssave/am.java
@@ -14,12 +14,12 @@ class am implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      int var2 = aj.AboutDialogCloseListener(this.ItemDetailsDialog).getSelectedIndex();
+      int var2 = aj.access$getGalaxyComboBox(this.ItemDetailsDialog).getSelectedIndex();
       if (var2 < 0) {
          JOptionPane.showOptionDialog(this.ItemDetailsDialog, "Invalid galaxy selected, please try again.", "Error", 0, 0, (Icon)null, new Object[]{"Cancel"}, (Object)null);
       } else {
          if (JOptionPane.showOptionDialog(this.ItemDetailsDialog, "This will warp your character and ship to the specified system (not the portal itself).", "Confirm", 2, 1, (Icon)null, new String[]{"OK", "Cancel"}, (Object)null) == 0) {
-            aj.AboutDialog(this.ItemDetailsDialog, true);
+            aj.access$setEditing(this.ItemDetailsDialog, true);
             this.ItemDetailsDialog.setVisible(false);
          }
 
diff --git a/nomanssave/as.java b/nomanssave/as.java
index 8823576..22653fa 100644
--- a/nomanssave/as.java
+++ b/nomanssave/as.java
@@ -13,7 +13,7 @@ class as implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      String[] var2 = p.AboutDialogCloseListener((Container)this.cu);
+      String[] var2 = p.show((Container)this.cu);
       boolean var3 = false;
 
       for(int var4 = 0; var4 < var2.length; ++var4) {
diff --git a/nomanssave/ax.java b/nomanssave/ax.java
index dc34532..e365b91 100644
--- a/nomanssave/ax.java
+++ b/nomanssave/ax.java
@@ -58,15 +58,15 @@ public boolean isCellEditable(int var1, int var2) {
          } else {
             switch(var2) {
             case 2:
-               return var3.AboutDialog(Race.kr);
+               return var3.isSpokenBy(Race.kr);
             case 3:
-               return var3.AboutDialog(Race.ks);
+               return var3.isSpokenBy(Race.ks);
             case 4:
-               return var3.AboutDialog(Race.kt);
+               return var3.isSpokenBy(Race.kt);
             case 5:
-               return var3.AboutDialog(Race.kv);
+               return var3.isSpokenBy(Race.kv);
             case 6:
-               return var3.AboutDialog(Race.kz);
+               return var3.isSpokenBy(Race.kz);
             default:
                return false;
             }
@@ -78,22 +78,22 @@ public boolean isCellEditable(int var1, int var2) {
 
    public Object getValueAt(int var1, int var2) {
       AlienWord var3 = AlienWord.T(var1);
-      gA var4 = DiscoveryPanel.i(this.cu).AboutDialog(var3);
+      gA var4 = DiscoveryPanel.i(this.cu).getWordEntry(var3);
       switch(var2) {
       case 0:
          return var3 == null ? "" : var3.getText();
       case 1:
          return var4.getID();
       case 2:
-         return var4.AccountPanel(Race.kr);
+         return var4.hasRecipeForRace(Race.kr);
       case 3:
-         return var4.AccountPanel(Race.ks);
+         return var4.hasRecipeForRace(Race.ks);
       case 4:
-         return var4.AccountPanel(Race.kt);
+         return var4.hasRecipeForRace(Race.kt);
       case 5:
-         return var4.AccountPanel(Race.kv);
+         return var4.hasRecipeForRace(Race.kv);
       case 6:
-         return var4.AccountPanel(Race.kz);
+         return var4.hasRecipeForRace(Race.kz);
       default:
          return null;
       }
@@ -101,22 +101,22 @@ public Object getValueAt(int var1, int var2) {
 
    public void setValueAt(Object var1, int var2, int var3) {
       AlienWord var4 = AlienWord.T(var2);
-      gA var5 = DiscoveryPanel.i(this.cu).AboutDialog(var4);
+      gA var5 = DiscoveryPanel.i(this.cu).getWordEntry(var4);
       switch(var3) {
       case 2:
-         var5.AboutDialog(Race.kr, Boolean.TRUE.equals(var1));
+         var5.setRecipeEnabled(Race.kr, Boolean.TRUE.equals(var1));
          break;
       case 3:
-         var5.AboutDialog(Race.ks, Boolean.TRUE.equals(var1));
+         var5.setRecipeEnabled(Race.ks, Boolean.TRUE.equals(var1));
          break;
       case 4:
-         var5.AboutDialog(Race.kt, Boolean.TRUE.equals(var1));
+         var5.setRecipeEnabled(Race.kt, Boolean.TRUE.equals(var1));
          break;
       case 5:
-         var5.AboutDialog(Race.kv, Boolean.TRUE.equals(var1));
+         var5.setRecipeEnabled(Race.kv, Boolean.TRUE.equals(var1));
          break;
       case 6:
-         var5.AboutDialog(Race.kz, Boolean.TRUE.equals(var1));
+         var5.setRecipeEnabled(Race.kz, Boolean.TRUE.equals(var1));
       }
 
    }
diff --git a/nomanssave/bA.java b/nomanssave/bA.java
index 74aaa98..02d7c2c 100644
--- a/nomanssave/bA.java
+++ b/nomanssave/bA.java
@@ -17,7 +17,7 @@ protected String g(String var1) {
          int var2 = FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].aq(this.index);
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 0, 50);
+            int var3 = hf.parseIntClamped(var1, 0, 50);
             if (var3 != var2) {
                FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].e(this.index, var3);
             }
diff --git a/nomanssave/bJ.java b/nomanssave/bJ.java
index 61ae9cd..fa927f8 100644
--- a/nomanssave/bJ.java
+++ b/nomanssave/bJ.java
@@ -45,7 +45,7 @@ protected String g(String var1) {
                int var3;
                switch(this.type) {
                case 0:
-                  var3 = hf.AboutDialogCloseListener(var1, 0, Integer.MAX_VALUE);
+                  var3 = hf.parseIntClamped(var1, 0, Integer.MAX_VALUE);
                   MilestonesPanel.AboutDialog(this.ItemDefinition).AboutDialog(this.ez, var3);
                   var1 = Integer.toString(var3);
                   break;
diff --git a/nomanssave/bL.java b/nomanssave/bL.java
index 1b506e4..8684d43 100644
--- a/nomanssave/bL.java
+++ b/nomanssave/bL.java
@@ -26,7 +26,7 @@ void ac() {
    }
 
    // $FF: synthetic method
-   static MilestonesPanel AboutDialog(bL var0) {
+   static MilestonesPanel access$getMilestonesPanel(bL var0) {
       return var0.ItemDefinition;
    }
 }
diff --git a/nomanssave/bM.java b/nomanssave/bM.java
index 9b78317..01160f8 100644
--- a/nomanssave/bM.java
+++ b/nomanssave/bM.java
@@ -19,7 +19,7 @@ public void focusGained(FocusEvent var1) {
    }
 
    public void focusLost(FocusEvent var1) {
-      if (MilestonesPanel.AboutDialog(bL.AboutDialog(this.eC)) != null) {
+      if (MilestonesPanel.access$getExosuit(bL.access$getMilestonesPanel(this.eC)) != null) {
          JTextField var2 = (JTextField)var1.getComponent();
          String var3 = this.eD.ab();
          String var4 = var2.getText();
diff --git a/nomanssave/bN.java b/nomanssave/bN.java
index 5d439f4..94964cc 100644
--- a/nomanssave/bN.java
+++ b/nomanssave/bN.java
@@ -11,29 +11,29 @@ class bN extends FormPanel {
       this.ItemDefinition = var1;
    }
 
-   void AboutDialog(String var1, gs var2) {
-      this.AboutDialog(var1, (gs)var2, true, (String)null);
+   void addRow(String var1, gs var2) {
+      this.addRow(var1, (gs)var2, true, (String)null);
    }
 
-   void AboutDialog(String var1, gs var2, boolean var3, String var4) {
+   void addRow(String var1, gs var2, boolean var3, String var4) {
       bJ var5 = new bJ(this.ItemDefinition, var2, var3);
       if (var4 != null) {
          var5.setToolTipText(var4);
       }
 
-      this.AboutDialog(var1, (JComponent)var5);
+      this.addRow(var1, (JComponent)var5);
    }
 
-   void AboutDialog(String var1, bK var2) {
-      this.AboutDialog(var1, (bK)var2, true, (String)null);
+   void addRow(String var1, bK var2) {
+      this.addRow(var1, (bK)var2, true, (String)null);
    }
 
-   void AboutDialog(String var1, bK var2, boolean var3, String var4) {
+   void addRow(String var1, bK var2, boolean var3, String var4) {
       bL var5 = new bL(this.ItemDefinition, var2, var3);
       if (var4 != null) {
          var5.setToolTipText(var4);
       }
 
-      this.AboutDialog(var1, (JComponent)var5);
+      this.addRow(var1, (JComponent)var5);
    }
 }
diff --git a/nomanssave/bR.java b/nomanssave/bR.java
index 0c1047d..cfd655e 100644
--- a/nomanssave/bR.java
+++ b/nomanssave/bR.java
@@ -14,7 +14,7 @@ class bR implements ActionListener {
 
    public void actionPerformed(ActionEvent var1) {
       if (InventoryPanel.AboutDialog(this.JsonParseException) != null) {
-         Dimension var2 = aQ.AboutDialog(this.JsonParseException, InventoryPanel.AboutDialog(this.JsonParseException).getSize(), InventoryPanel.AboutDialog(this.JsonParseException).dm(), InventoryPanel.AboutDialog(this.JsonParseException).dn());
+         Dimension var2 = aQ.access$setDimension(this.JsonParseException, InventoryPanel.AboutDialog(this.JsonParseException).getSize(), InventoryPanel.AboutDialog(this.JsonParseException).dm(), InventoryPanel.AboutDialog(this.JsonParseException).dn());
          if (var2 != null && InventoryPanel.AboutDialog(this.JsonParseException).AboutDialog(var2)) {
             InventoryPanel.AccountPanel(this.JsonParseException);
          }
diff --git a/nomanssave/bh.java b/nomanssave/bh.java
index 1066c01..af39a17 100644
--- a/nomanssave/bh.java
+++ b/nomanssave/bh.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          double var2 = FreighterPanel.AboutDialog(this.dP).cX();
 
          try {
-            double var4 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var4 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var4 != var2) {
                FreighterPanel.AboutDialog(this.dP).AboutDialog(var4);
             }
diff --git a/nomanssave/bi.java b/nomanssave/bi.java
index 45e7ef8..8ae98d9 100644
--- a/nomanssave/bi.java
+++ b/nomanssave/bi.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          double var2 = FreighterPanel.AboutDialog(this.dP).cY();
 
          try {
-            double var4 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var4 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var4 != var2) {
                FreighterPanel.AboutDialog(this.dP).AboutDialogCloseListener(var4);
             }
diff --git a/nomanssave/bn.java b/nomanssave/bn.java
index 027325a..1fa8dc8 100644
--- a/nomanssave/bn.java
+++ b/nomanssave/bn.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].dc();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 0, Integer.MAX_VALUE);
+            int var3 = hf.parseIntClamped(var1, 0, Integer.MAX_VALUE);
             if (var3 != var2) {
                FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].as(var3);
             }
diff --git a/nomanssave/bo.java b/nomanssave/bo.java
index 7f5254b..1072ce5 100644
--- a/nomanssave/bo.java
+++ b/nomanssave/bo.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].dd();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 0, Integer.MAX_VALUE);
+            int var3 = hf.parseIntClamped(var1, 0, Integer.MAX_VALUE);
             if (var3 != var2) {
                FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].at(var3);
             }
diff --git a/nomanssave/bp.java b/nomanssave/bp.java
index ff9e3e4..b5c164d 100644
--- a/nomanssave/bp.java
+++ b/nomanssave/bp.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].de();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 0, Integer.MAX_VALUE);
+            int var3 = hf.parseIntClamped(var1, 0, Integer.MAX_VALUE);
             if (var3 != var2) {
                FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].au(var3);
             }
diff --git a/nomanssave/bq.java b/nomanssave/bq.java
index ebde9fb..1ec9d17 100644
--- a/nomanssave/bq.java
+++ b/nomanssave/bq.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].df();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 0, Integer.MAX_VALUE);
+            int var3 = hf.parseIntClamped(var1, 0, Integer.MAX_VALUE);
             if (var3 != var2) {
                FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].av(var3);
             }
diff --git a/nomanssave/bt.java b/nomanssave/bt.java
index eca4c39..a42ee7a 100644
--- a/nomanssave/bt.java
+++ b/nomanssave/bt.java
@@ -20,7 +20,7 @@ public void valueChanged(ListSelectionEvent var1) {
    }
 
    // $FF: synthetic method
-   static FrigatesPanel AboutDialog(bt var0) {
+   static FrigatesPanel access$getFrigatesPanel(bt var0) {
       return var0.er;
    }
 }
diff --git a/nomanssave/bu.java b/nomanssave/bu.java
index c74385b..cb7994c 100644
--- a/nomanssave/bu.java
+++ b/nomanssave/bu.java
@@ -14,86 +14,86 @@ class bu implements Runnable {
    }
 
    public void run() {
-      FrigatesPanel.AboutDialog(bt.AboutDialog(this.es), FrigatesPanel.e(bt.AboutDialog(this.es)).getSelectedRow());
+      FrigatesPanel.AboutDialog(bt.access$getFrigatesPanel(this.es), FrigatesPanel.e(bt.access$getFrigatesPanel(this.es)).getSelectedRow());
       int var1;
-      if (FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es)) < 0) {
-         FrigatesPanel.AboutDialog(bt.AboutDialog(this.es), new er[0]);
-         FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es), new er[0]);
-         FrigatesPanel.h(bt.AboutDialog(this.es)).setVisible(false);
-         FrigatesPanel.i(bt.AboutDialog(this.es)).setVisible(false);
-         FrigatesPanel.j(bt.AboutDialog(this.es)).setText("");
-         FrigatesPanel.k(bt.AboutDialog(this.es)).setSelectedIndex(-1);
-         FrigatesPanel.l(bt.AboutDialog(this.es)).setText("");
-         FrigatesPanel.m(bt.AboutDialog(this.es)).setSelectedIndex(-1);
-         FrigatesPanel.n(bt.AboutDialog(this.es)).setText("");
-         FrigatesPanel.o(bt.AboutDialog(this.es)).setText("");
+      if (FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es)) < 0) {
+         FrigatesPanel.AboutDialog(bt.access$getFrigatesPanel(this.es), new er[0]);
+         FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es), new er[0]);
+         FrigatesPanel.h(bt.access$getFrigatesPanel(this.es)).setVisible(false);
+         FrigatesPanel.i(bt.access$getFrigatesPanel(this.es)).setVisible(false);
+         FrigatesPanel.j(bt.access$getFrigatesPanel(this.es)).setText("");
+         FrigatesPanel.k(bt.access$getFrigatesPanel(this.es)).setSelectedIndex(-1);
+         FrigatesPanel.l(bt.access$getFrigatesPanel(this.es)).setText("");
+         FrigatesPanel.m(bt.access$getFrigatesPanel(this.es)).setSelectedIndex(-1);
+         FrigatesPanel.n(bt.access$getFrigatesPanel(this.es)).setText("");
+         FrigatesPanel.o(bt.access$getFrigatesPanel(this.es)).setText("");
 
-         for(var1 = 0; var1 < FrigatesPanel.d(bt.AboutDialog(this.es)).length; ++var1) {
-            FrigatesPanel.d(bt.AboutDialog(this.es))[var1].setText("");
+         for(var1 = 0; var1 < FrigatesPanel.d(bt.access$getFrigatesPanel(this.es)).length; ++var1) {
+            FrigatesPanel.d(bt.access$getFrigatesPanel(this.es))[var1].setText("");
          }
 
-         FrigatesPanel.p(bt.AboutDialog(this.es)).setSelectedIndex(-1);
-         FrigatesPanel.q(bt.AboutDialog(this.es)).setSelectedIndex(-1);
-         FrigatesPanel.r(bt.AboutDialog(this.es)).setSelectedIndex(-1);
-         FrigatesPanel.s(bt.AboutDialog(this.es)).setSelectedIndex(-1);
-         FrigatesPanel.t(bt.AboutDialog(this.es)).setSelectedIndex(-1);
-         FrigatesPanel.u(bt.AboutDialog(this.es)).setText("");
-         FrigatesPanel.RefreshRunnable(bt.AboutDialog(this.es)).setText("");
-         FrigatesPanel.AppStartupRunnable(bt.AboutDialog(this.es)).setText("");
-         FrigatesPanel.UpdateCheckThread(bt.AboutDialog(this.es)).setText("");
-         FrigatesPanel.h(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.i(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.UpdateDownloadRunnable(bt.AboutDialog(this.es)).setText("");
-         FrigatesPanel.ShowErrorRunnable(bt.AboutDialog(this.es)).setVisible(false);
-         FrigatesPanel.ShowWarningRunnable(bt.AboutDialog(this.es)).setEnabled(false);
-         FrigatesPanel.g(bt.AboutDialog(this.es)).setEnabled(false);
+         FrigatesPanel.p(bt.access$getFrigatesPanel(this.es)).setSelectedIndex(-1);
+         FrigatesPanel.q(bt.access$getFrigatesPanel(this.es)).setSelectedIndex(-1);
+         FrigatesPanel.r(bt.access$getFrigatesPanel(this.es)).setSelectedIndex(-1);
+         FrigatesPanel.s(bt.access$getFrigatesPanel(this.es)).setSelectedIndex(-1);
+         FrigatesPanel.t(bt.access$getFrigatesPanel(this.es)).setSelectedIndex(-1);
+         FrigatesPanel.u(bt.access$getFrigatesPanel(this.es)).setText("");
+         FrigatesPanel.RefreshRunnable(bt.access$getFrigatesPanel(this.es)).setText("");
+         FrigatesPanel.AppStartupRunnable(bt.access$getFrigatesPanel(this.es)).setText("");
+         FrigatesPanel.UpdateCheckThread(bt.access$getFrigatesPanel(this.es)).setText("");
+         FrigatesPanel.h(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.i(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.UpdateDownloadRunnable(bt.access$getFrigatesPanel(this.es)).setText("");
+         FrigatesPanel.ShowErrorRunnable(bt.access$getFrigatesPanel(this.es)).setVisible(false);
+         FrigatesPanel.ShowWarningRunnable(bt.access$getFrigatesPanel(this.es)).setEnabled(false);
+         FrigatesPanel.g(bt.access$getFrigatesPanel(this.es)).setEnabled(false);
       } else {
-         FrigatesPanel.AboutDialog(bt.AboutDialog(this.es), er.AboutDialog(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].da()));
-         FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es), er.AboutDialogCloseListener(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].da()));
-         FrigatesPanel.h(bt.AboutDialog(this.es)).setVisible(true);
-         FrigatesPanel.i(bt.AboutDialog(this.es)).setVisible(true);
-         FrigatesPanel.j(bt.AboutDialog(this.es)).setText(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].getName());
-         FrigatesPanel.k(bt.AboutDialog(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].da());
-         FrigatesPanel.l(bt.AboutDialog(this.es)).setText(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].LineNumberPanel().toString());
-         FrigatesPanel.m(bt.AboutDialog(this.es)).m(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].db());
-         FrigatesPanel.n(bt.AboutDialog(this.es)).setText(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].cU());
-         FrigatesPanel.o(bt.AboutDialog(this.es)).setText(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].cV());
+         FrigatesPanel.AboutDialog(bt.access$getFrigatesPanel(this.es), er.AboutDialog(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].da()));
+         FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es), er.AboutDialogCloseListener(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].da()));
+         FrigatesPanel.h(bt.access$getFrigatesPanel(this.es)).setVisible(true);
+         FrigatesPanel.i(bt.access$getFrigatesPanel(this.es)).setVisible(true);
+         FrigatesPanel.j(bt.access$getFrigatesPanel(this.es)).setText(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].getName());
+         FrigatesPanel.k(bt.access$getFrigatesPanel(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].da());
+         FrigatesPanel.l(bt.access$getFrigatesPanel(this.es)).setText(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].LineNumberPanel().toString());
+         FrigatesPanel.m(bt.access$getFrigatesPanel(this.es)).m(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].db());
+         FrigatesPanel.n(bt.access$getFrigatesPanel(this.es)).setText(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].cU());
+         FrigatesPanel.o(bt.access$getFrigatesPanel(this.es)).setText(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].cV());
 
-         for(var1 = 0; var1 < FrigatesPanel.d(bt.AboutDialog(this.es)).length; ++var1) {
-            FrigatesPanel.d(bt.AboutDialog(this.es))[var1].setText(Integer.toString(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].aq(var1)));
+         for(var1 = 0; var1 < FrigatesPanel.d(bt.access$getFrigatesPanel(this.es)).length; ++var1) {
+            FrigatesPanel.d(bt.access$getFrigatesPanel(this.es))[var1].setText(Integer.toString(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].aq(var1)));
          }
 
-         FrigatesPanel.p(bt.AboutDialog(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].ar(0));
-         FrigatesPanel.q(bt.AboutDialog(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].ar(1));
-         FrigatesPanel.r(bt.AboutDialog(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].ar(2));
-         FrigatesPanel.s(bt.AboutDialog(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].ar(3));
-         FrigatesPanel.t(bt.AboutDialog(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].ar(4));
-         FrigatesPanel.u(bt.AboutDialog(this.es)).setText(Integer.toString(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].dc()));
-         FrigatesPanel.RefreshRunnable(bt.AboutDialog(this.es)).setText(Integer.toString(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].dd()));
-         FrigatesPanel.AppStartupRunnable(bt.AboutDialog(this.es)).setText(Integer.toString(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].de()));
-         FrigatesPanel.UpdateCheckThread(bt.AboutDialog(this.es)).setText(Integer.toString(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].df()));
-         if (this.bv.j(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].getIndex())) {
-            FrigatesPanel.UpdateDownloadRunnable(bt.AboutDialog(this.es)).setText("Status: On Mission");
-            FrigatesPanel.UpdateDownloadRunnable(bt.AboutDialog(this.es)).setForeground(Color.BLUE);
-            FrigatesPanel.ShowErrorRunnable(bt.AboutDialog(this.es)).setVisible(false);
-         } else if (FrigatesPanel.AccountPanel(bt.AboutDialog(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.AboutDialog(this.es))].dh() > 0) {
-            FrigatesPanel.UpdateDownloadRunnable(bt.AboutDialog(this.es)).setText("Status: Damaged!");
-            FrigatesPanel.UpdateDownloadRunnable(bt.AboutDialog(this.es)).setForeground(Color.RED);
-            FrigatesPanel.ShowErrorRunnable(bt.AboutDialog(this.es)).setVisible(true);
+         FrigatesPanel.p(bt.access$getFrigatesPanel(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].ar(0));
+         FrigatesPanel.q(bt.access$getFrigatesPanel(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].ar(1));
+         FrigatesPanel.r(bt.access$getFrigatesPanel(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].ar(2));
+         FrigatesPanel.s(bt.access$getFrigatesPanel(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].ar(3));
+         FrigatesPanel.t(bt.access$getFrigatesPanel(this.es)).setSelectedItem(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].ar(4));
+         FrigatesPanel.u(bt.access$getFrigatesPanel(this.es)).setText(Integer.toString(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].dc()));
+         FrigatesPanel.RefreshRunnable(bt.access$getFrigatesPanel(this.es)).setText(Integer.toString(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].dd()));
+         FrigatesPanel.AppStartupRunnable(bt.access$getFrigatesPanel(this.es)).setText(Integer.toString(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].de()));
+         FrigatesPanel.UpdateCheckThread(bt.access$getFrigatesPanel(this.es)).setText(Integer.toString(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].df()));
+         if (this.bv.j(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].getIndex())) {
+            FrigatesPanel.UpdateDownloadRunnable(bt.access$getFrigatesPanel(this.es)).setText("Status: On Mission");
+            FrigatesPanel.UpdateDownloadRunnable(bt.access$getFrigatesPanel(this.es)).setForeground(Color.BLUE);
+            FrigatesPanel.ShowErrorRunnable(bt.access$getFrigatesPanel(this.es)).setVisible(false);
+         } else if (FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es))[FrigatesPanel.AboutDialogCloseListener(bt.access$getFrigatesPanel(this.es))].dh() > 0) {
+            FrigatesPanel.UpdateDownloadRunnable(bt.access$getFrigatesPanel(this.es)).setText("Status: Damaged!");
+            FrigatesPanel.UpdateDownloadRunnable(bt.access$getFrigatesPanel(this.es)).setForeground(Color.RED);
+            FrigatesPanel.ShowErrorRunnable(bt.access$getFrigatesPanel(this.es)).setVisible(true);
          } else {
-            FrigatesPanel.UpdateDownloadRunnable(bt.AboutDialog(this.es)).setText("");
-            FrigatesPanel.ShowErrorRunnable(bt.AboutDialog(this.es)).setVisible(false);
+            FrigatesPanel.UpdateDownloadRunnable(bt.access$getFrigatesPanel(this.es)).setText("");
+            FrigatesPanel.ShowErrorRunnable(bt.access$getFrigatesPanel(this.es)).setVisible(false);
          }
 
-         FrigatesPanel.h(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.i(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.p(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.q(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.r(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.s(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.t(bt.AboutDialog(this.es)).updateUI();
-         FrigatesPanel.ShowWarningRunnable(bt.AboutDialog(this.es)).setEnabled(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es)).length > 1);
-         FrigatesPanel.g(bt.AboutDialog(this.es)).setEnabled(FrigatesPanel.AccountPanel(bt.AboutDialog(this.es)).length < 30 || en.aS());
+         FrigatesPanel.h(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.i(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.p(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.q(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.r(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.s(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.t(bt.access$getFrigatesPanel(this.es)).updateUI();
+         FrigatesPanel.ShowWarningRunnable(bt.access$getFrigatesPanel(this.es)).setEnabled(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es)).length > 1);
+         FrigatesPanel.g(bt.access$getFrigatesPanel(this.es)).setEnabled(FrigatesPanel.AccountPanel(bt.access$getFrigatesPanel(this.es)).length < 30 || en.aS());
       }
    }
 }
diff --git a/nomanssave/bw.java b/nomanssave/bw.java
index 3aca136..3217160 100644
--- a/nomanssave/bw.java
+++ b/nomanssave/bw.java
@@ -28,8 +28,8 @@ public void removeListDataListener(ListDataListener var1) {
 
    public void setSelectedItem(Object var1) {
       this.et = (FrigateClass)var1;
-      FrigatesPanel.AboutDialog(this.er, FrigatesPanel.AboutDialogCloseListener(this.er) < 0 ? null : nomanssave.er.AboutDialog(this.et));
-      FrigatesPanel.AboutDialogCloseListener(this.er, FrigatesPanel.AboutDialogCloseListener(this.er) < 0 ? null : nomanssave.er.AboutDialogCloseListener(this.et));
+      FrigatesPanel.AboutDialog(this.er, FrigatesPanel.AboutDialogCloseListener(this.er) < 0 ? null : er.getByPrimaryClass(this.et));
+      FrigatesPanel.AboutDialogCloseListener(this.er, FrigatesPanel.AboutDialogCloseListener(this.er) < 0 ? null : er.getBySecondaryClass(this.et));
       if (FrigatesPanel.AboutDialogCloseListener(this.er) >= 0 && this.et != null && !this.et.equals(FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].da())) {
          FrigatesPanel.AccountPanel(this.er)[FrigatesPanel.AboutDialogCloseListener(this.er)].AccountPanel(this.et);
          if (FrigatesPanel.AboutDialog(this.er) != null && FrigatesPanel.AboutDialog(this.er).length > 0) {
diff --git a/nomanssave/cD.java b/nomanssave/cD.java
index 8875659..0cbe2b0 100644
--- a/nomanssave/cD.java
+++ b/nomanssave/cD.java
@@ -12,6 +12,6 @@ class cD implements PropertyChangeListener {
    }
 
    public void propertyChange(PropertyChangeEvent var1) {
-      AppSettings.AboutDialogCloseListener("JSONEditor.Divider", (Integer)var1.getNewValue());
+      AppSettings.setValueByPath("JSONEditor.Divider", (Integer)var1.getNewValue());
    }
 }
diff --git a/nomanssave/cF.java b/nomanssave/cF.java
index 3212805..68c2c71 100644
--- a/nomanssave/cF.java
+++ b/nomanssave/cF.java
@@ -15,6 +15,6 @@ public void actionPerformed(ActionEvent var1) {
       int var2 = JsonEditorDialog.AccountPanel(this.gg).getSelectionStart();
       int var3 = JsonEditorDialog.AccountPanel(this.gg).getSelectionEnd();
       String var4 = var3 > var2 ? JsonEditorDialog.AccountPanel(this.gg).getText().substring(var2, var3) : null;
-      aW.AboutDialog(this.gg, var4);
+      aW.show(this.gg, var4);
    }
 }
diff --git a/nomanssave/cI.java b/nomanssave/cI.java
index 719dcd1..7e99a19 100644
--- a/nomanssave/cI.java
+++ b/nomanssave/cI.java
@@ -48,7 +48,7 @@ public void removeTreeModelListener(TreeModelListener var1) {
       this.gh.remove(var1);
    }
 
-   public void AboutDialog(cJ var1) {
+   public void notifyTreeChanged(cJ var1) {
       ArrayList var2 = new ArrayList();
       var2.add(var1);
 
diff --git a/nomanssave/cN.java b/nomanssave/cN.java
index c8f66b1..1eae1d2 100644
--- a/nomanssave/cN.java
+++ b/nomanssave/cN.java
@@ -62,27 +62,27 @@ public void m(String var1) {
       this.updateUI();
    }
 
-   public void AboutDialog(cR var1) {
+   public void setSelected(cR var1) {
       this.Frigate = var1;
    }
 
    // $FF: synthetic method
-   static List AboutDialog(cN var0) {
+   static List access$getItems(cN var0) {
       return var0.FreighterType;
    }
 
    // $FF: synthetic method
-   static Object AboutDialogCloseListener(cN var0) {
+   static Object access$getSelectedItem(cN var0) {
       return var0.gq;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(cN var0, Object var1) {
+   static void access$setSelectedItem(cN var0, Object var1) {
       var0.gq = var1;
    }
 
    // $FF: synthetic method
-   static cR AccountPanel(cN var0) {
+   static cR access$getChangeListener(cN var0) {
       return var0.Frigate;
    }
 
diff --git a/nomanssave/cO.java b/nomanssave/cO.java
index 7c25a74..31206f3 100644
--- a/nomanssave/cO.java
+++ b/nomanssave/cO.java
@@ -16,11 +16,11 @@ class cO implements ComboBoxModel {
    }
 
    public int getSize() {
-      return ((Enum[])this.gu.getEnumConstants()).length + cN.AboutDialog(this.Inventory).size();
+      return ((Enum[])this.gu.getEnumConstants()).length + cN.access$getItems(this.Inventory).size();
    }
 
    public Object getElementAt(int var1) {
-      return var1 < ((Enum[])this.gu.getEnumConstants()).length ? ((Enum[])this.gu.getEnumConstants())[var1] : cN.AboutDialog(this.Inventory).get(var1 - ((Enum[])this.gu.getEnumConstants()).length);
+      return var1 < ((Enum[])this.gu.getEnumConstants()).length ? ((Enum[])this.gu.getEnumConstants())[var1] : cN.access$getItems(this.Inventory).get(var1 - ((Enum[])this.gu.getEnumConstants()).length);
    }
 
    public void addListDataListener(ListDataListener var1) {
@@ -30,21 +30,21 @@ public void removeListDataListener(ListDataListener var1) {
    }
 
    public void setSelectedItem(Object var1) {
-      Object var2 = cN.AboutDialogCloseListener(this.Inventory);
-      cN.AboutDialog(this.Inventory, var1);
-      if (cN.AccountPanel(this.Inventory) != null) {
+      Object var2 = cN.access$getSelectedItem(this.Inventory);
+      cN.access$setSelectedItem(this.Inventory, var1);
+      if (cN.access$getChangeListener(this.Inventory) != null) {
          SwingUtilities.invokeLater(() -> {
-            if (cN.AboutDialogCloseListener(this.Inventory) == null) {
+            if (cN.access$getSelectedItem(this.Inventory) == null) {
                if (var2 != null) {
-                  cN.AccountPanel(this.Inventory).setSelectedValue((String)null);
+                  cN.access$getChangeListener(this.Inventory).setSelectedValue((String)null);
                }
-            } else if (var2 == null || !cN.AboutDialogCloseListener(this.Inventory).equals(var2)) {
+            } else if (var2 == null || !cN.access$getSelectedItem(this.Inventory).equals(var2)) {
                if (cN.d(this.Inventory)) {
-                  cN.AccountPanel(this.Inventory).setSelectedValue(((gD)cN.AboutDialogCloseListener(this.Inventory)).K());
-               } else if (cN.AboutDialogCloseListener(this.Inventory) instanceof Enum) {
-                  cN.AccountPanel(this.Inventory).setSelectedValue(((Enum)cN.AboutDialogCloseListener(this.Inventory)).name());
+                  cN.access$getChangeListener(this.Inventory).setSelectedValue(((gD)cN.access$getSelectedItem(this.Inventory)).K());
+               } else if (cN.access$getSelectedItem(this.Inventory) instanceof Enum) {
+                  cN.access$getChangeListener(this.Inventory).setSelectedValue(((Enum)cN.access$getSelectedItem(this.Inventory)).name());
                } else {
-                  cN.AccountPanel(this.Inventory).setSelectedValue(cN.AboutDialogCloseListener(this.Inventory).toString());
+                  cN.access$getChangeListener(this.Inventory).setSelectedValue(cN.access$getSelectedItem(this.Inventory).toString());
                }
             }
 
@@ -54,6 +54,6 @@ public void setSelectedItem(Object var1) {
    }
 
    public Object getSelectedItem() {
-      return cN.AboutDialogCloseListener(this.Inventory);
+      return cN.access$getSelectedItem(this.Inventory);
    }
 }
diff --git a/nomanssave/cS.java b/nomanssave/cS.java
index 5efc113..4d6993d 100644
--- a/nomanssave/cS.java
+++ b/nomanssave/cS.java
@@ -9,7 +9,7 @@ class cS implements gD {
    cS(cN var1, String var2) {
       this.Inventory = var1;
       this.filename = var2;
-      this.index = cN.AboutDialog(var1).size() + 1;
+      this.index = cN.access$getItems(var1).size() + 1;
    }
 
    public String K() {
diff --git a/nomanssave/cY.java b/nomanssave/cY.java
index d874ace..d06f8b1 100644
--- a/nomanssave/cY.java
+++ b/nomanssave/cY.java
@@ -60,7 +60,7 @@ private cY(Frame var1) {
       this.pack();
    }
 
-   private int AboutDialogCloseListener(List var1) {
+   private int showDialog(List var1) {
       this.ShipClass = var1;
       this.setLocationRelativeTo(this.getParent());
       this.SquadronPilot.setSelectedIndex(0);
@@ -70,27 +70,27 @@ private int AboutDialogCloseListener(List var1) {
       return this.Vehicle;
    }
 
-   public static int AboutDialog(Container var0, List var1) {
+   public static int show(Container var0, List var1) {
       if (gP == null) {
          Frame var2 = JOptionPane.getFrameForComponent(var0);
          gP = new cY(var2);
       }
 
-      return gP.AboutDialogCloseListener(var1);
+      return gP.showDialog(var1);
    }
 
    // $FF: synthetic method
-   static List AboutDialog(cY var0) {
+   static List access$getItems(cY var0) {
       return var0.ShipClass;
    }
 
    // $FF: synthetic method
-   static JComboBox AboutDialogCloseListener(cY var0) {
+   static JComboBox access$getComboBox(cY var0) {
       return var0.SquadronPilot;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(cY var0, int var1) {
+   static void access$setSelected(cY var0, int var1) {
       var0.Vehicle = var1;
    }
 }
diff --git a/nomanssave/cZ.java b/nomanssave/cZ.java
index 466d8fb..a0e4199 100644
--- a/nomanssave/cZ.java
+++ b/nomanssave/cZ.java
@@ -14,11 +14,11 @@ class cZ implements ComboBoxModel {
    }
 
    public int getSize() {
-      return cY.AboutDialog(this.TemplateLoader).size();
+      return cY.access$getItems(this.TemplateLoader).size();
    }
 
    public gg C(int var1) {
-      return (gg)cY.AboutDialog(this.TemplateLoader).get(var1);
+      return (gg)cY.access$getItems(this.TemplateLoader).get(var1);
    }
 
    public void addListDataListener(ListDataListener var1) {
diff --git a/nomanssave/cf.java b/nomanssave/cf.java
index d19b87d..5787097 100644
--- a/nomanssave/cf.java
+++ b/nomanssave/cf.java
@@ -20,7 +20,7 @@ class cf implements ActionListener {
    public void actionPerformed(ActionEvent var1) {
       gu var2 = InventoryPanel.AboutDialog(InventorySlotPanel.j(this.fk)).f(this.FileWatcher, this.FileWatcherThread);
       if (var2 != null) {
-         var2.AccountPanel(0.0D);
+         var2.setDamageFactor(0.0D);
          var2.e(true);
          InventorySlotPanel.AccountPanel(this.fk);
       }
diff --git a/nomanssave/ch.java b/nomanssave/ch.java
index f9ddb26..673c6d2 100644
--- a/nomanssave/ch.java
+++ b/nomanssave/ch.java
@@ -13,7 +13,7 @@ protected String g(String var1) {
          return "";
       } else {
          try {
-            int var2 = hf.AboutDialogCloseListener(var1, 0, 99999);
+            int var2 = hf.parseIntClamped(var1, 0, 99999);
             if (ItemDetailsDialog.AboutDialog(this.fF) != var2) {
                ItemDetailsDialog.AboutDialogCloseListener(this.fF).m(ItemDetailsDialog.AccountPanel(this.fF).M(var2));
                ItemDetailsDialog.AboutDialog(this.fF, new Integer(var2));
diff --git a/nomanssave/ci.java b/nomanssave/ci.java
index 8d0ba34..7198578 100644
--- a/nomanssave/ci.java
+++ b/nomanssave/ci.java
@@ -13,7 +13,7 @@ protected String g(String var1) {
          return "";
       } else {
          try {
-            int var2 = hf.AboutDialogCloseListener(var1, 1, ItemDetailsDialog.AboutDialogCloseListener(this.fF).dB());
+            int var2 = hf.parseIntClamped(var1, 1, ItemDetailsDialog.AboutDialogCloseListener(this.fF).dB());
             if (ItemDetailsDialog.d(this.fF) != var2) {
                ItemDetailsDialog.AboutDialogCloseListener(this.fF).aA(var2);
                ItemDetailsDialog.AboutDialogCloseListener(this.fF, new Integer(var2));
diff --git a/nomanssave/cz.java b/nomanssave/cz.java
index 2e4c119..31925d8 100644
--- a/nomanssave/cz.java
+++ b/nomanssave/cz.java
@@ -15,13 +15,13 @@ class cz extends ComponentAdapter {
 
    public void componentMoved(ComponentEvent var1) {
       Point var2 = this.gg.getBounds().getLocation();
-      AppSettings.AboutDialogCloseListener("JSONEditor.X", var2.UpdateCheckThread);
-      AppSettings.AboutDialogCloseListener("JSONEditor.Y", var2.UpdateDownloadRunnable);
+      AppSettings.setValueByPath("JSONEditor.X", var2.UpdateCheckThread);
+      AppSettings.setValueByPath("JSONEditor.Y", var2.UpdateDownloadRunnable);
    }
 
    public void componentResized(ComponentEvent var1) {
       Dimension var2 = this.gg.getBounds().getSize();
-      AppSettings.AboutDialogCloseListener("JSONEditor.Width", var2.width);
-      AppSettings.AboutDialogCloseListener("JSONEditor.Height", var2.height);
+      AppSettings.setValueByPath("JSONEditor.Width", var2.width);
+      AppSettings.setValueByPath("JSONEditor.Height", var2.height);
    }
 }
diff --git a/nomanssave/dB.java b/nomanssave/dB.java
index 2808807..3d9a1ce 100644
--- a/nomanssave/dB.java
+++ b/nomanssave/dB.java
@@ -13,9 +13,9 @@ class dB implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      int var2 = dz.AboutDialogCloseListener(this.hu).getSelectedIndex();
+      int var2 = dz.access$getList(this.hu).getSelectedIndex();
       if (var2 < 0 || dz.AboutDialog(this.hu)[var2].isEmpty() || JOptionPane.showConfirmDialog(this.hu, "You are about to overwrite this save slot, are you sure you want to do this?", "Warning", 2) == 0) {
-         dz.AboutDialog(this.hu, var2);
+         dz.access$setSelectedIndex(this.hu, var2);
          this.hu.setVisible(false);
       }
    }
diff --git a/nomanssave/dF.java b/nomanssave/dF.java
index 8eae00c..4c899ce 100644
--- a/nomanssave/dF.java
+++ b/nomanssave/dF.java
@@ -38,7 +38,7 @@ public void setSelectedItem(Object var1) {
             SettlementsPanel.e(this.hE)[var2].setText("");
          }
 
-         SettlementsPanel.f(this.hE).AboutDialog(new gF[0]);
+         SettlementsPanel.f(this.hE).updateAlienWords(new gF[0]);
       } else {
          SettlementsPanel.AccountPanel(this.hE).setText(this.hD.getName());
          SettlementsPanel.d(this.hE).setText(this.hD.cK());
@@ -47,7 +47,7 @@ public void setSelectedItem(Object var1) {
             SettlementsPanel.e(this.hE)[var2].setText(Integer.toString(this.hD.aq(var2)));
          }
 
-         SettlementsPanel.f(this.hE).AboutDialog(this.hD.dX());
+         SettlementsPanel.f(this.hE).updateAlienWords(this.hD.dX());
       }
 
       SettlementsPanel.g(this.hE).revalidate();
diff --git a/nomanssave/dM.java b/nomanssave/dM.java
index 2eb8cc5..84eb8a0 100644
--- a/nomanssave/dM.java
+++ b/nomanssave/dM.java
@@ -18,7 +18,7 @@ protected String g(String var1) {
          int var3 = var2.aq(this.hH.ordinal());
 
          try {
-            int var4 = hf.AboutDialogCloseListener(var1, 0, this.hH.dY());
+            int var4 = hf.parseIntClamped(var1, 0, this.hH.dY());
             if (var4 != var3) {
                var2.e(this.hH.ordinal(), var4);
             }
diff --git a/nomanssave/dP.java b/nomanssave/dP.java
index baade49..2812c77 100644
--- a/nomanssave/dP.java
+++ b/nomanssave/dP.java
@@ -16,7 +16,7 @@ protected String g(String var1) {
          double var3 = var2.ec();
 
          try {
-            double var5 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var5 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var5 != var3) {
                var2.i(var5);
             }
diff --git a/nomanssave/dW.java b/nomanssave/dW.java
index 190e7b8..b167253 100644
--- a/nomanssave/dW.java
+++ b/nomanssave/dW.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = ShipsPanel.o(this.ia).dM();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 1, 500);
+            int var3 = hf.parseIntClamped(var1, 1, 500);
             if (var3 != var2) {
                ShipsPanel.o(this.ia).aB(var3);
             }
diff --git a/nomanssave/dX.java b/nomanssave/dX.java
index 9cc820e..e3ef96a 100644
--- a/nomanssave/dX.java
+++ b/nomanssave/dX.java
@@ -15,7 +15,7 @@ protected String g(String var1) {
          int var2 = ShipsPanel.o(this.ia).ShipsPanel();
 
          try {
-            int var3 = hf.AboutDialogCloseListener(var1, 1, 200);
+            int var3 = hf.parseIntClamped(var1, 1, 200);
             if (var3 != var2) {
                ShipsPanel.o(this.ia).aC(var3);
             }
diff --git a/nomanssave/dY.java b/nomanssave/dY.java
index b58dd95..058b9e7 100644
--- a/nomanssave/dY.java
+++ b/nomanssave/dY.java
@@ -16,7 +16,7 @@ protected String g(String var1) {
          double var3 = var2.dF();
 
          try {
-            double var5 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var5 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var5 != var3) {
                var2.d(var5);
             }
diff --git a/nomanssave/dZ.java b/nomanssave/dZ.java
index 2e9af34..f27ac18 100644
--- a/nomanssave/dZ.java
+++ b/nomanssave/dZ.java
@@ -16,7 +16,7 @@ protected String g(String var1) {
          double var3 = var2.SquadronPanel();
 
          try {
-            double var5 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var5 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var5 != var3) {
                var2.h(var5);
             }
diff --git a/nomanssave/da.java b/nomanssave/da.java
index 0d90699..f31cbec 100644
--- a/nomanssave/da.java
+++ b/nomanssave/da.java
@@ -12,7 +12,7 @@ class da implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      cY.AboutDialog(this.TemplateLoader, cY.AboutDialogCloseListener(this.TemplateLoader).getSelectedIndex());
+      cY.access$setSelected(this.TemplateLoader, cY.access$getComboBox(this.TemplateLoader).getSelectedIndex());
       this.TemplateLoader.setVisible(false);
    }
 }
diff --git a/nomanssave/dd.java b/nomanssave/dd.java
index 85da126..968c95f 100644
--- a/nomanssave/dd.java
+++ b/nomanssave/dd.java
@@ -50,7 +50,7 @@ private dd(Frame var1) {
       this.getRootPane().registerKeyboardAction(new di(this), KeyStroke.getKeyStroke(27, 0), 2);
    }
 
-   private int AboutDialog(List var1, int var2) {
+   private int showDialog(List var1, int var2) {
       this.CoordinateTransform = var1;
       this.BackupUtil.updateUI();
       this.BackupUtil.setSelectedIndex(this.gU);
@@ -60,27 +60,27 @@ private int AboutDialog(List var1, int var2) {
       return this.gU;
    }
 
-   public static int AboutDialog(Container var0, List var1, int var2) {
+   public static int show(Container var0, List var1, int var2) {
       if (gV == null) {
          Frame var3 = JOptionPane.getFrameForComponent(var0);
          gV = new dd(var3);
       }
 
-      return gV.AboutDialog(var1, var2);
+      return gV.showDialog(var1, var2);
    }
 
    // $FF: synthetic method
-   static List AboutDialog(dd var0) {
+   static List access$getItems(dd var0) {
       return var0.CoordinateTransform;
    }
 
    // $FF: synthetic method
-   static JList AboutDialogCloseListener(dd var0) {
+   static JList access$getList(dd var0) {
       return var0.BackupUtil;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(dd var0, int var1) {
+   static void access$setSelectedIndex(dd var0, int var1) {
       var0.gU = var1;
    }
 }
diff --git a/nomanssave/de.java b/nomanssave/de.java
index 035f84b..bc91f3c 100644
--- a/nomanssave/de.java
+++ b/nomanssave/de.java
@@ -12,11 +12,11 @@ class de implements ListModel {
    }
 
    public int getSize() {
-      return dd.AboutDialog(this.gW).size();
+      return dd.access$getItems(this.gW).size();
    }
 
    public Inventory AppStartupRunnable(int var1) {
-      return (Inventory)dd.AboutDialog(this.gW).get(var1);
+      return (Inventory)dd.access$getItems(this.gW).get(var1);
    }
 
    public void addListDataListener(ListDataListener var1) {
diff --git a/nomanssave/df.java b/nomanssave/df.java
index dbca7b7..18369ea 100644
--- a/nomanssave/df.java
+++ b/nomanssave/df.java
@@ -13,7 +13,7 @@ class df extends MouseAdapter {
 
    public void mouseClicked(MouseEvent var1) {
       if (var1.getClickCount() == 2) {
-         dd.AboutDialog(this.gW, dd.AboutDialogCloseListener(this.gW).getSelectedIndex());
+         dd.show(this.gW, dd.access$getList(this.gW).getSelectedIndex());
          this.gW.setVisible(false);
       }
 
diff --git a/nomanssave/dg.java b/nomanssave/dg.java
index 66bd784..5faa0a7 100644
--- a/nomanssave/dg.java
+++ b/nomanssave/dg.java
@@ -12,7 +12,7 @@ class dg implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      dd.AboutDialog(this.gW, dd.AboutDialogCloseListener(this.gW).getSelectedIndex());
+      dd.show(this.gW, dd.access$getList(this.gW).getSelectedIndex());
       this.gW.setVisible(false);
    }
 }
diff --git a/nomanssave/dn.java b/nomanssave/dn.java
index 1c2dca2..2705e66 100644
--- a/nomanssave/dn.java
+++ b/nomanssave/dn.java
@@ -16,7 +16,7 @@ protected String g(String var1) {
          double var3 = var2.dF();
 
          try {
-            double var5 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var5 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var5 != var3) {
                var2.d(var5);
             }
diff --git a/nomanssave/do.java b/nomanssave/do.java
index 23178fe..d01bafb 100644
--- a/nomanssave/do.java
+++ b/nomanssave/do.java
@@ -16,7 +16,7 @@ protected String g(String var1) {
          double var3 = var2.dG();
 
          try {
-            double var5 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var5 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var5 != var3) {
                var2.e(var5);
             }
diff --git a/nomanssave/dp.java b/nomanssave/dp.java
index 9c3415a..388d469 100644
--- a/nomanssave/dp.java
+++ b/nomanssave/dp.java
@@ -16,7 +16,7 @@ protected String g(String var1) {
          double var3 = var2.dH();
 
          try {
-            double var5 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var5 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var5 != var3) {
                var2.f(var5);
             }
diff --git a/nomanssave/dt.java b/nomanssave/dt.java
index b2ab423..9d474e3 100644
--- a/nomanssave/dt.java
+++ b/nomanssave/dt.java
@@ -20,7 +20,7 @@ public class dt extends FormPanel {
       this.k("Production");
       this.AlienWord = new JPanel();
       this.AlienWord.setLayout(new GridBagLayout());
-      this.AboutDialog((JComponent)this.AlienWord);
+      this.addField((JComponent)this.AlienWord);
       UIManager.addPropertyChangeListener((var1x) -> {
          if ("lookAndFeel".equals(var1x.getPropertyName())) {
             EventQueue.invokeLater(this::aL);
@@ -42,7 +42,7 @@ private void aL() {
 
             Component var2 = var5[var3];
             du var6 = (du)var2;
-            du.AccountPanel(var6);
+            du.access$refreshUI(var6);
             ++var3;
          }
       }
@@ -51,7 +51,7 @@ private void aL() {
       this.AlienWord.updateUI();
    }
 
-   public void AboutDialog(gF[] var1) {
+   public void updateAlienWords(gF[] var1) {
       synchronized(this.AlienWord.getTreeLock()) {
          this.AlienWord.removeAll();
          int var3 = 0;
@@ -76,30 +76,30 @@ public void AboutDialog(gF[] var1) {
       this.AlienWord.updateUI();
    }
 
-   private void AboutDialog(du var1) {
-      ItemDefinition var2 = h.AboutDialog(this, 28160);
+   private void pickItemForSlot(du var1) {
+      ItemDefinition var2 = h.show(this, 28160);
       if (var2 != null) {
          var1.hm.m(var2.aZ());
          var1.hm.aA(0);
-         du.AccountPanel(var1);
+         du.access$refreshUI(var1);
       }
 
    }
 
-   private void AboutDialogCloseListener(du var1) {
+   private void moveItemToInventory(du var1) {
       ItemDefinition var2 = ItemDefinition.d(var1.hm.dz());
       if (var2 == null) {
          this.eR.AccountPanel("Item details not found!");
       } else {
          List var3 = this.eR.g(3584);
-         int var4 = dd.AboutDialog(this, var3, -1);
+         int var4 = dd.show(this, var3, -1);
          if (var4 != -1) {
             Inventory var5 = (Inventory)var3.get(var4);
             int var6 = var1.hm.dA();
             ItemDefinition var7 = ItemDefinition.d(var1.hm.dz());
             var6 = var5.AboutDialog(var7, var6);
             var1.hm.aA(var6);
-            du.AccountPanel(var1);
+            du.access$refreshUI(var1);
             this.eR.AboutDialog(var5);
          }
 
@@ -107,12 +107,12 @@ private void AboutDialogCloseListener(du var1) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(dt var0, du var1) {
-      var0.AboutDialog(var1);
+   static void access$pickItem(dt var0, du var1) {
+      var0.pickItemForSlot(var1);
    }
 
    // $FF: synthetic method
-   static void AboutDialogCloseListener(dt var0, du var1) {
-      var0.AboutDialogCloseListener(var1);
+   static void access$moveItem(dt var0, du var1) {
+      var0.moveItemToInventory(var1);
    }
 }
diff --git a/nomanssave/du.java b/nomanssave/du.java
index ce1c374..8d06ca2 100644
--- a/nomanssave/du.java
+++ b/nomanssave/du.java
@@ -117,7 +117,7 @@ private void aM() {
    }
 
    // $FF: synthetic method
-   static void AccountPanel(du var0) {
+   static void access$refreshUI(du var0) {
       var0.aM();
    }
 
diff --git a/nomanssave/dz.java b/nomanssave/dz.java
index d6f373f..fed3314 100644
--- a/nomanssave/dz.java
+++ b/nomanssave/dz.java
@@ -48,7 +48,7 @@ private dz(Frame var1) {
       this.getRootPane().registerKeyboardAction(new dD(this), KeyStroke.getKeyStroke(27, 0), 2);
    }
 
-   private int AboutDialog(SaveSlot[] var1, int var2) {
+   private int showDialog(SaveSlot[] var1, int var2) {
       this.hs = var1;
       this.hr.updateUI();
       this.hr.setSelectedIndex(var2);
@@ -58,27 +58,27 @@ private int AboutDialog(SaveSlot[] var1, int var2) {
       return this.gU;
    }
 
-   public static int AboutDialog(Container var0, SaveSlot[] var1, int var2) {
+   public static int show(Container var0, SaveSlot[] var1, int var2) {
       if (ht == null) {
          Frame var3 = JOptionPane.getFrameForComponent(var0);
          ht = new dz(var3);
       }
 
-      return ht.AboutDialog(var1, var2);
+      return ht.showDialog(var1, var2);
    }
 
    // $FF: synthetic method
-   static SaveSlot[] AboutDialog(dz var0) {
+   static SaveSlot[] access$getSlots(dz var0) {
       return var0.hs;
    }
 
    // $FF: synthetic method
-   static JList AboutDialogCloseListener(dz var0) {
+   static JList access$getList(dz var0) {
       return var0.hr;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(dz var0, int var1) {
+   static void access$setSelectedIndex(dz var0, int var1) {
       var0.gU = var1;
    }
 }
diff --git a/nomanssave/eA.java b/nomanssave/eA.java
index a43572d..bd3685c 100644
--- a/nomanssave/eA.java
+++ b/nomanssave/eA.java
@@ -32,7 +32,7 @@ class eA {
       this.description = var2;
    }
 
-   private String AboutDialog(String var1, Function var2) {
+   private String interpolate(String var1, Function var2) {
       StringBuilder var3 = new StringBuilder();
       int var4 = 0;
 
@@ -45,15 +45,15 @@ private String AboutDialog(String var1, Function var2) {
       return var3.toString();
    }
 
-   String AboutDialog(Function var1) {
-      return this.AboutDialog(this.name, var1);
+   String getName(Function var1) {
+      return this.interpolate(this.name, var1);
    }
 
-   String AboutDialogCloseListener(Function var1) {
-      return this.AboutDialog(this.jM, var1);
+   String getSubtitle(Function var1) {
+      return this.interpolate(this.jM, var1);
    }
 
-   String AccountPanel(Function var1) {
-      return this.description == null ? null : this.AboutDialog(this.description, var1);
+   String getDescription(Function var1) {
+      return this.description == null ? null : this.interpolate(this.description, var1);
    }
 }
diff --git a/nomanssave/eC.java b/nomanssave/eC.java
index 4ed4d17..0b62d13 100644
--- a/nomanssave/eC.java
+++ b/nomanssave/eC.java
@@ -12,8 +12,8 @@ public class eC {
    private final eE jU;
 
    static {
-      jS[0] = AccountPanel("db/jsonmap.txt", "NMS 5.21 (savegame)");
-      jS[1] = AccountPanel("db/jsonmapac.txt", "NMS 5.21 (account)");
+      jS[0] = loadEncoding("db/jsonmap.txt", "NMS 5.21 (savegame)");
+      jS[1] = loadEncoding("db/jsonmapac.txt", "NMS 5.21 (account)");
    }
 
    public static void main(String[] var0) {
@@ -35,7 +35,7 @@ public static void main(String[] var0) {
 
    private static String hashName(String var0) {
       long[] var1 = new long[]{8268756125562466087L, 8268756125562466087L};
-      SpookyHash.AboutDialog(var0.getBytes("UTF-8"), var1);
+      SpookyHash.hashBytes(var0.getBytes("UTF-8"), var1);
       String var2 = "0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxy";
       long var3 = 4294967295L & var1[0] >> 32;
       var3 = var3 % 68L << 32 | 4294967295L & var1[0];
@@ -45,12 +45,12 @@ private static String hashName(String var0) {
       return new String(new char[]{var2.charAt(var5), var2.charAt(var6), var2.charAt(var7)});
    }
 
-   public static eC AboutDialog(eG var0, String var1) {
+   public static eC findEncoding(eG var0, String var1) {
       eD var2 = jS[var0.ordinal()];
       return var2 != null && var2.s(var1) ? new eC(var2) : null;
    }
 
-   private static eD AccountPanel(String var0, String var1) {
+   private static eD loadEncoding(String var0, String var1) {
       InputStream var2 = Application.class.getResourceAsStream(var0);
       if (var2 == null) {
          return null;
diff --git a/nomanssave/eD.java b/nomanssave/eD.java
index 624b0c9..ccdfaee 100644
--- a/nomanssave/eD.java
+++ b/nomanssave/eD.java
@@ -47,7 +47,7 @@ private eD(InputStream var1, String var2) {
                   }
                }
             } catch (RuntimeException var13) {
-               Logger.AboutDialog("Ignoring: " + var5, var13);
+               Logger.error("Ignoring: " + var5, var13);
             }
          }
       } finally {
diff --git a/nomanssave/eJ.java b/nomanssave/eJ.java
index b79b1c9..0c2c53e 100644
--- a/nomanssave/eJ.java
+++ b/nomanssave/eJ.java
@@ -3,12 +3,12 @@
 import java.util.Comparator;
 
 class eJ implements Comparator {
-   public int AboutDialog(eI var1, eI var2) {
+   public int compare(eI var1, eI var2) {
       return var1.name.compareTo(var2.name);
    }
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((eI)var1, (eI)var2);
+      return this.compare((eI)var1, (eI)var2);
    }
 }
diff --git a/nomanssave/eK.java b/nomanssave/eK.java
index 2447808..aeb37ac 100644
--- a/nomanssave/eK.java
+++ b/nomanssave/eK.java
@@ -3,12 +3,12 @@
 import java.util.Comparator;
 
 class eK implements Comparator {
-   public int AboutDialog(eI var1, eI var2) {
+   public int compare(eI var1, eI var2) {
       return var1.name.compareTo(var2.name);
    }
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((eI)var1, (eI)var2);
+      return this.compare((eI)var1, (eI)var2);
    }
 }
diff --git a/nomanssave/eL.java b/nomanssave/eL.java
index 141d88f..60dbd9e 100644
--- a/nomanssave/eL.java
+++ b/nomanssave/eL.java
@@ -3,12 +3,12 @@
 import java.util.Comparator;
 
 class eL implements Comparator {
-   public int AboutDialog(eI var1, eI var2) {
+   public int compare(eI var1, eI var2) {
       return var1.name.compareTo(var2.name);
    }
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((eI)var1, (eI)var2);
+      return this.compare((eI)var1, (eI)var2);
    }
 }
diff --git a/nomanssave/eN.java b/nomanssave/eN.java
index 8554bc8..9a64dae 100644
--- a/nomanssave/eN.java
+++ b/nomanssave/eN.java
@@ -3,12 +3,12 @@
 import java.util.Comparator;
 
 class eN implements Comparator {
-   public int AboutDialog(eM var1, eM var2) {
+   public int compare(eM var1, eM var2) {
       return var1.name.compareTo(var2.name);
    }
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((eM)var1, (eM)var2);
+      return this.compare((eM)var1, (eM)var2);
    }
 }
diff --git a/nomanssave/eT.java b/nomanssave/eT.java
index 0b82c32..fa8f3fc 100644
--- a/nomanssave/eT.java
+++ b/nomanssave/eT.java
@@ -3,12 +3,12 @@
 import java.util.Comparator;
 
 class eT implements Comparator {
-   public int AboutDialog(AlienWord var1, AlienWord var2) {
+   public int compare(AlienWord var1, AlienWord var2) {
       return var1.text.compareTo(var2.text);
    }
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((AlienWord)var1, (AlienWord)var2);
+      return this.compare((AlienWord)var1, (AlienWord)var2);
    }
 }
diff --git a/nomanssave/ea.java b/nomanssave/ea.java
index 7ad520f..b6adf90 100644
--- a/nomanssave/ea.java
+++ b/nomanssave/ea.java
@@ -16,7 +16,7 @@ protected String g(String var1) {
          double var3 = var2.cX();
 
          try {
-            double var5 = hf.AboutDialog(var1, 0.0D, 1000.0D);
+            double var5 = hf.parseDoubleClamped(var1, 0.0D, 1000.0D);
             if (var5 != var3) {
                var2.AboutDialog(var5);
             }
diff --git a/nomanssave/ec.java b/nomanssave/ec.java
index 6cf1911..c310973 100644
--- a/nomanssave/ec.java
+++ b/nomanssave/ec.java
@@ -54,12 +54,12 @@ private void aQ() {
    }
 
    // $FF: synthetic method
-   static JCheckBox AboutDialog(ec var0) {
+   static JCheckBox access$getCheckBox(ec var0) {
       return var0.if;
    }
 
    // $FF: synthetic method
-   static JComboBox AboutDialogCloseListener(ec var0) {
+   static JComboBox access$getComboBox(ec var0) {
       return var0.ig;
    }
 
diff --git a/nomanssave/ed.java b/nomanssave/ed.java
index de2b4e8..3cc15cb 100644
--- a/nomanssave/ed.java
+++ b/nomanssave/ed.java
@@ -15,10 +15,10 @@ class ed implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      if (ec.AboutDialog(this.ik).isSelected() ^ SquadronPanel.AboutDialog(ec.h(this.ik))[this.il].isEnabled()) {
-         boolean var2 = ec.AboutDialog(this.ik).isSelected();
+      if (ec.access$getCheckBox(this.ik).isSelected() ^ SquadronPanel.AboutDialog(ec.h(this.ik))[this.il].isEnabled()) {
+         boolean var2 = ec.access$getCheckBox(this.ik).isSelected();
          SquadronPanel.AboutDialog(ec.h(this.ik))[this.il].setEnabled(var2);
-         ec.AboutDialogCloseListener(this.ik).setEnabled(var2);
+         ec.access$getComboBox(this.ik).setEnabled(var2);
          ec.AccountPanel(this.ik).setEnabled(var2);
          ec.d(this.ik).setEnabled(var2);
          ec.e(this.ik).setEnabled(var2);
diff --git a/nomanssave/ej.java b/nomanssave/ej.java
index 24d5e18..86d8f0a 100644
--- a/nomanssave/ej.java
+++ b/nomanssave/ej.java
@@ -30,7 +30,7 @@ private ej() {
       });
    }
 
-   private String AboutDialog(File var1) {
+   private String formatFileName(File var1) {
       Matcher var2 = iq.matcher(var1.getName());
       if (var2.matches()) {
          long var3 = Long.parseLong(var2.group(1));
@@ -40,7 +40,7 @@ private String AboutDialog(File var1) {
       }
    }
 
-   public static File AboutDialogCloseListener(File var0) {
+   public static File createFileChooser(File var0) {
       if (ir == null) {
          ir = new ej();
       }
@@ -78,8 +78,8 @@ static ImageIcon au() {
    }
 
    // $FF: synthetic method
-   static String AboutDialog(ej var0, File var1) {
-      return var0.AboutDialog(var1);
+   static String access$formatFileName(ej var0, File var1) {
+      return var0.formatFileName(var1);
    }
 
    // $FF: synthetic method
diff --git a/nomanssave/el.java b/nomanssave/el.java
index 070b0af..bebcf30 100644
--- a/nomanssave/el.java
+++ b/nomanssave/el.java
@@ -22,7 +22,7 @@ public Icon getIcon(File var1) {
             return var2.equals("containers.index") ? ej.au() : null;
          }
       } else {
-         var2 = ej.AboutDialog(this.is, var1);
+         var2 = ej.access$formatFileName(this.is, var1);
          return var2 == null ? null : ej.aR();
       }
    }
@@ -31,7 +31,7 @@ public String getName(File var1) {
       if (var1.isFile()) {
          return var1.getName();
       } else {
-         String var2 = ej.AboutDialog(this.is, var1);
+         String var2 = ej.access$formatFileName(this.is, var1);
          return var2 == null ? var1.getName() : "[" + var2 + "] " + var1.getName();
       }
    }
diff --git a/nomanssave/en.java b/nomanssave/en.java
index 34d27ab..d3a2007 100644
--- a/nomanssave/en.java
+++ b/nomanssave/en.java
@@ -8,7 +8,7 @@ public class en {
    private static boolean iu = false;
    private static List iv = new ArrayList();
 
-   public static void AboutDialog(eo var0) {
+   public static void addListener(eo var0) {
       iv.add(var0);
    }
 
@@ -16,13 +16,13 @@ public static boolean aS() {
       return iu;
    }
 
-   public static void AccountPanel(boolean var0) {
+   public static void setEnabled(boolean var0) {
       iu = var0;
       Iterator var2 = iv.iterator();
 
       while(var2.hasNext()) {
          eo var1 = (eo)var2.next();
-         var1.AboutDialog(var0);
+         var1.setEnabled(var0);
       }
 
    }
diff --git a/nomanssave/eo.java b/nomanssave/eo.java
index e5380c8..9f13f27 100644
--- a/nomanssave/eo.java
+++ b/nomanssave/eo.java
@@ -1,5 +1,5 @@
 package nomanssave;
 
 public interface eo {
-   void AboutDialog(boolean var1);
+   void setEnabled(boolean var1);
 }
diff --git a/nomanssave/er.java b/nomanssave/er.java
index c8bb62f..01652e3 100644
--- a/nomanssave/er.java
+++ b/nomanssave/er.java
@@ -106,7 +106,7 @@ public String toString() {
       return this.name + " (" + var1 + " " + this.iB + ")";
    }
 
-   public static er[] AboutDialog(FrigateClass var0) {
+   public static er[] getByPrimaryClass(FrigateClass var0) {
       return (er[])iG.stream().filter((var1) -> {
          return var1.iD == var0;
       }).toArray((var0x) -> {
@@ -114,7 +114,7 @@ public static er[] AboutDialog(FrigateClass var0) {
       });
    }
 
-   public static er[] AboutDialogCloseListener(FrigateClass var0) {
+   public static er[] getBySecondaryClass(FrigateClass var0) {
       return (er[])iG.stream().filter((var1) -> {
          return Arrays.stream(var1.iF).anyMatch((var1x) -> {
             return var1x == var0;
diff --git a/nomanssave/es.java b/nomanssave/es.java
index 01dae33..7e5bd58 100644
--- a/nomanssave/es.java
+++ b/nomanssave/es.java
@@ -3,12 +3,12 @@
 import java.util.Comparator;
 
 class es implements Comparator {
-   public int AboutDialog(er var1, er var2) {
+   public int compare(er var1, er var2) {
       return var1.name.compareTo(var2.name);
    }
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((er)var1, (er)var2);
+      return this.compare((er)var1, (er)var2);
    }
 }
diff --git a/nomanssave/eu.java b/nomanssave/eu.java
index 5f19592..6c20bdc 100644
--- a/nomanssave/eu.java
+++ b/nomanssave/eu.java
@@ -38,7 +38,7 @@ public class eu {
 
    }
 
-   public static ew AboutDialogCloseListener(String var0, String var1) {
+   public static ew findByName(String var0, String var1) {
       Iterator var3 = iH.iterator();
 
       while(true) {
diff --git a/nomanssave/f.java b/nomanssave/f.java
index cd69460..9c8bb43 100644
--- a/nomanssave/f.java
+++ b/nomanssave/f.java
@@ -32,7 +32,7 @@ class f extends JTable {
       this.getColumnModel().getColumn(2).setCellRenderer(new d((d)null));
    }
 
-   void AboutDialog(JsonArray var1) {
+   void setData(JsonArray var1) {
       this.g = var1;
    }
 }
diff --git a/nomanssave/fB.java b/nomanssave/fB.java
index be1862d..fe075e3 100644
--- a/nomanssave/fB.java
+++ b/nomanssave/fB.java
@@ -10,11 +10,11 @@ class fB extends fH implements AccountData {
    }
 
    public JsonObject M() {
-      return PS4SaveLocation.AboutDialogCloseListener(this.readBytes(), eG.jW);
+      return PS4SaveLocation.access$readMetadata(this.readBytes(), eG.jW);
    }
 
    public void k(JsonObject var1) {
-      this.AboutDialog("ps4_accountdata", (GameMode)null, (String)null, (String)null);
+      this.writeMetadata("ps4_accountdata", (GameMode)null, (String)null, (String)null);
       this.writeBytes(PS4SaveLocation.l(var1));
    }
 }
diff --git a/nomanssave/fC.java b/nomanssave/fC.java
index 7db0512..2580b44 100644
--- a/nomanssave/fC.java
+++ b/nomanssave/fC.java
@@ -116,17 +116,17 @@ public JsonObject M() {
          throw var2;
       }
 
-      return PS4SaveLocation.AboutDialogCloseListener(var1.toByteArray(), eG.jV);
+      return PS4SaveLocation.access$readMetadata(var1.toByteArray(), eG.jV);
    }
 
-   public String AboutDialogCloseListener(JsonObject var1) {
+   public String writeToFile(JsonObject var1) {
       Logger.info("Writing new save file...");
       String var2;
-      if (PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.mb] != null) {
-         var2 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.mb].AboutDialogCloseListener(var1);
+      if (PS4SaveLocation.access$getSaveFiles(this.ma)[this.mb] != null) {
+         var2 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.mb.writeToFile(var1);
       } else {
-         PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.mb] = new fD(this.ma, this.mb, this.lK, var1);
-         var2 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.mb].K();
+         PS4SaveLocation.access$getSaveFiles(this.ma)[this.mb] = new fD(this.ma, this.mb, this.lK, var1);
+         var2 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.mb].K();
       }
 
       Logger.info("Finished.");
diff --git a/nomanssave/fD.java b/nomanssave/fD.java
index 3e815dc..37bd35a 100644
--- a/nomanssave/fD.java
+++ b/nomanssave/fD.java
@@ -17,7 +17,7 @@ class fD extends fH implements SaveFile {
          String var3 = new String(this.ah(65536));
          this.me = GameMode.T(var3);
       } catch (IOException var4) {
-         Logger.AboutDialog("Could not read game mode from " + this.mh.getName(), var4);
+         Logger.error("Could not read game mode from " + this.mh.getName(), var4);
       }
 
    }
@@ -36,10 +36,10 @@ public GameMode L() {
    }
 
    public JsonObject M() {
-      return PS4SaveLocation.AboutDialogCloseListener(this.readBytes(), eG.jV);
+      return PS4SaveLocation.access$readMetadata(this.readBytes(), eG.jV);
    }
 
-   public String AboutDialogCloseListener(JsonObject var1) {
+   public String writeToFile(JsonObject var1) {
       this.AboutDialog(this.lO == 0 ? "ps4_backup" : "ps4_backup" + (this.lO + 1), this.me, this.getName(), this.getDescription());
       this.writeBytes(PS4SaveLocation.l(var1));
       return this.K();
diff --git a/nomanssave/fE.java b/nomanssave/fE.java
index 521ca57..d53c062 100644
--- a/nomanssave/fE.java
+++ b/nomanssave/fE.java
@@ -17,18 +17,18 @@ public int getIndex() {
    }
 
    public boolean isEmpty() {
-      return PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2] == null && PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1] == null;
+      return PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2] == null && PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1] == null;
    }
 
    public SaveFile[] bX() {
       Logger.info("Loading saves for Slot " + (this.lT + 1) + "...");
       ArrayList var1 = new ArrayList();
-      if (PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2] != null) {
-         var1.add(PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2]);
+      if (PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2] != null) {
+         var1.add(PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2]);
       }
 
-      if (PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1] != null) {
-         var1.add(PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1]);
+      if (PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1] != null) {
+         var1.add(PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1]);
       }
 
       AppSettings.cG.listFiles(new fF(this, var1));
@@ -39,15 +39,15 @@ public SaveFile[] bX() {
    public GameMode L() {
       long var1 = Long.MIN_VALUE;
       GameMode var3 = null;
-      if (PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2] != null) {
-         var3 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2].L();
-         var1 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2].lastModified();
+      if (PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2] != null) {
+         var3 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2].L();
+         var1 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2].lastModified();
       }
 
-      if (PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1] != null) {
-         long var4 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1].lastModified();
+      if (PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1] != null) {
+         long var4 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1].lastModified();
          if (var4 > var1) {
-            var3 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1].L();
+            var3 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1].L();
          }
       }
 
@@ -59,15 +59,15 @@ public String toString() {
       var1.append("Slot " + (this.lT + 1) + " - ");
       long var2 = Long.MIN_VALUE;
       GameMode var4 = null;
-      if (PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2] != null) {
-         var4 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2].L();
-         var2 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2].lastModified();
+      if (PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2] != null) {
+         var4 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2].L();
+         var2 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2].lastModified();
       }
 
-      if (PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1] != null) {
-         long var5 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1].lastModified();
+      if (PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1] != null) {
+         long var5 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1].lastModified();
          if (var5 > var2) {
-            var4 = PS4SaveLocation.AboutDialogCloseListener(this.ma)[this.lT * 2 + 1].L();
+            var4 = PS4SaveLocation.access$getSaveFiles(this.ma)[this.lT * 2 + 1].L();
             var2 = var5;
          }
       }
@@ -83,7 +83,7 @@ public String toString() {
    }
 
    // $FF: synthetic method
-   static PS4SaveLocation AboutDialog(fE var0) {
+   static PS4SaveLocation access$getPS4SaveLocation(fE var0) {
       return var0.ma;
    }
 }
diff --git a/nomanssave/fF.java b/nomanssave/fF.java
index 0ebfd4b..39f9129 100644
--- a/nomanssave/fF.java
+++ b/nomanssave/fF.java
@@ -23,7 +23,7 @@ public boolean accept(File var1) {
          int var3 = var2.group(1).length() == 0 ? 0 : Integer.parseInt(var2.group(1)) - 1;
          if (var3 / 2 == this.mf.lT) {
             try {
-               this.mg.add(new fC(fE.AboutDialog(this.mf), var1.getName(), var3));
+               this.mg.add(new fC(fE.access$getPS4SaveLocation(this.mf), var1.getName(), var3));
             } catch (IOException var5) {
                Logger.AboutDialog("Cannot load " + var1.getName(), var5);
             }
diff --git a/nomanssave/fG.java b/nomanssave/fG.java
index f72c357..ce46766 100644
--- a/nomanssave/fG.java
+++ b/nomanssave/fG.java
@@ -10,7 +10,7 @@ class fG implements Comparator {
       this.mf = var1;
    }
 
-   public int AboutDialog(SaveFile var1, SaveFile var2) {
+   public int compare(SaveFile var1, SaveFile var2) {
       long var3 = var2.lastModified() - var1.lastModified();
       if (var3 < -2147483648L) {
          return Integer.MIN_VALUE;
@@ -21,6 +21,6 @@ public int AboutDialog(SaveFile var1, SaveFile var2) {
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((SaveFile)var1, (SaveFile)var2);
+      return this.compare((SaveFile)var1, (SaveFile)var2);
    }
 }
diff --git a/nomanssave/fH.java b/nomanssave/fH.java
index 4ed22e0..239552f 100644
--- a/nomanssave/fH.java
+++ b/nomanssave/fH.java
@@ -87,7 +87,7 @@ void writeBytes(byte[] var1) {
 
    }
 
-   void AboutDialog(String var1, GameMode var2, String var3, String var4) {
+   void writeMetadata(String var1, GameMode var2, String var3, String var4) {
       Properties var5 = new Properties();
       var5.setProperty("StorageFile", this.mh.getName());
       var5.setProperty("LastModified", Long.toString(this.mh.lastModified()));
diff --git a/nomanssave/fK.java b/nomanssave/fK.java
index 8c0f451..5e7ac25 100644
--- a/nomanssave/fK.java
+++ b/nomanssave/fK.java
@@ -14,7 +14,7 @@ public JsonObject M() {
    }
 
    public void k(JsonObject var1) {
-      this.AboutDialog("accountdata", (GameMode)null, (String)null, (String)null);
+      this.writeMetadata("accountdata", (GameMode)null, (String)null, (String)null);
       this.AboutDialog(var1, false);
    }
 }
diff --git a/nomanssave/fL.java b/nomanssave/fL.java
index d1d8a93..4568f47 100644
--- a/nomanssave/fL.java
+++ b/nomanssave/fL.java
@@ -73,14 +73,14 @@ public JsonObject M() {
       // $FF: Couldn't be decompiled
    }
 
-   public String AboutDialogCloseListener(JsonObject var1) {
+   public String writeToFile(JsonObject var1) {
       Logger.info("Writing new save file...");
       String var2;
-      if (SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.mb] != null) {
-         var2 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.mb].AboutDialogCloseListener(var1);
+      if (SteamSaveLocation.access$getSaveFiles(this.mt)[this.mb] != null) {
+         var2 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.mb].writeToFile(var1);
       } else {
-         SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.mb] = new fM(this.mt, this.mb, var1);
-         var2 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.mb].filename;
+         SteamSaveLocation.access$getSaveFiles(this.mt)[this.mb] = new fM(this.mt, this.mb, var1);
+         var2 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.mb].filename;
       }
 
       Logger.info("Finished.");
diff --git a/nomanssave/fM.java b/nomanssave/fM.java
index b1c02e2..4151f03 100644
--- a/nomanssave/fM.java
+++ b/nomanssave/fM.java
@@ -16,7 +16,7 @@ class fM extends SteamSaveFileMetadata implements SaveFile {
          String var3 = new String(this.ah(65536));
          this.me = GameMode.T(var3);
       } catch (IOException var4) {
-         Logger.AboutDialog("Could not read game mode from " + this.filename, var4);
+         Logger.error("Could not read game mode from " + this.filename, var4);
       }
 
    }
@@ -42,7 +42,7 @@ void cm() {
       (new File(SteamSaveLocation.AboutDialog(this.mt), "mf_" + this.filename)).delete();
    }
 
-   public String AboutDialogCloseListener(JsonObject var1) {
+   public String writeToFile(JsonObject var1) {
       this.AboutDialog(this.lO == 0 ? "backup" : "backup" + (this.lO + 1), this.me, this.getName(), this.getDescription());
       this.mx.Y(var1.getValueAsString("CommonStateData.SaveName"));
       this.me = GameMode.i(var1);
diff --git a/nomanssave/fN.java b/nomanssave/fN.java
index 27cbd66..83e6532 100644
--- a/nomanssave/fN.java
+++ b/nomanssave/fN.java
@@ -17,18 +17,18 @@ public int getIndex() {
    }
 
    public boolean isEmpty() {
-      return SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2] == null && SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1] == null;
+      return SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2] == null && SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1] == null;
    }
 
    public SaveFile[] bX() {
       Logger.info("Loading saves for Slot " + (this.lT + 1) + "...");
       ArrayList var1 = new ArrayList();
-      if (SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2] != null) {
-         var1.add(SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2]);
+      if (SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2] != null) {
+         var1.add(SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2]);
       }
 
-      if (SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1] != null) {
-         var1.add(SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1]);
+      if (SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1] != null) {
+         var1.add(SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1]);
       }
 
       AppSettings.cG.listFiles(new fO(this, var1));
@@ -39,15 +39,15 @@ public SaveFile[] bX() {
    public GameMode L() {
       long var1 = Long.MIN_VALUE;
       GameMode var3 = null;
-      if (SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2] != null) {
-         var3 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2].L();
-         var1 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2].lastModified();
+      if (SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2] != null) {
+         var3 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2].L();
+         var1 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2].lastModified();
       }
 
-      if (SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1] != null) {
-         long var4 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1].lastModified();
+      if (SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1] != null) {
+         long var4 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1].lastModified();
          if (var4 > var1) {
-            var3 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1].L();
+            var3 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1].L();
          }
       }
 
@@ -60,18 +60,18 @@ public String toString() {
       long var2 = Long.MIN_VALUE;
       String var4 = null;
       GameMode var5 = null;
-      if (SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2] != null) {
-         var5 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2].L();
-         var2 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2].lastModified();
-         var4 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2].getName();
+      if (SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2] != null) {
+         var5 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2].L();
+         var2 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2].lastModified();
+         var4 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2].getName();
       }
 
-      if (SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1] != null) {
-         long var6 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1].lastModified();
+      if (SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1] != null) {
+         long var6 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1].lastModified();
          if (var6 > var2) {
-            var5 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1].L();
+            var5 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1].L();
             var2 = var6;
-            var4 = SteamSaveLocation.AboutDialogCloseListener(this.mt)[this.lT * 2 + 1].getName();
+            var4 = SteamSaveLocation.access$getSaveFiles(this.mt)[this.lT * 2 + 1].getName();
          }
       }
 
@@ -90,7 +90,7 @@ public String toString() {
    }
 
    // $FF: synthetic method
-   static SteamSaveLocation AboutDialog(fN var0) {
+   static SteamSaveLocation access$getSteamSaveLocation(fN var0) {
       return var0.mt;
    }
 }
diff --git a/nomanssave/fO.java b/nomanssave/fO.java
index 7b1d282..37d1373 100644
--- a/nomanssave/fO.java
+++ b/nomanssave/fO.java
@@ -23,9 +23,9 @@ public boolean accept(File var1) {
          int var3 = var2.group(1).length() == 0 ? 0 : Integer.parseInt(var2.group(1)) - 1;
          if (var3 / 2 == this.mw.lT) {
             try {
-               this.mg.add(new fL(fN.AboutDialog(this.mw), var1.getName(), var3));
+               this.mg.add(new fL(fN.access$getSteamSaveLocation(this.mw), var1.getName(), var3));
             } catch (IOException var5) {
-               Logger.AboutDialog("Cannot load " + var1.getName(), var5);
+               Logger.error("Cannot load " + var1.getName(), var5);
             }
          }
       }
diff --git a/nomanssave/fP.java b/nomanssave/fP.java
index 9e5c10a..88d2b98 100644
--- a/nomanssave/fP.java
+++ b/nomanssave/fP.java
@@ -10,7 +10,7 @@ class fP implements Comparator {
       this.mw = var1;
    }
 
-   public int AboutDialog(SaveFile var1, SaveFile var2) {
+   public int compare(SaveFile var1, SaveFile var2) {
       long var3 = var2.lastModified() - var1.lastModified();
       if (var3 < -2147483648L) {
          return Integer.MIN_VALUE;
@@ -21,6 +21,6 @@ public int AboutDialog(SaveFile var1, SaveFile var2) {
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((SaveFile)var1, (SaveFile)var2);
+      return this.compare((SaveFile)var1, (SaveFile)var2);
    }
 }
diff --git a/nomanssave/fS.java b/nomanssave/fS.java
index 5d2e3d7..b9dc870 100644
--- a/nomanssave/fS.java
+++ b/nomanssave/fS.java
@@ -63,7 +63,7 @@ void read(InputStream var1) {
 
       this.my = hk.f(var1);
       if (this.my != 0L) {
-         Logger.info("  totalPlayTime: " + SaveLocation.AccountPanel(this.my));
+         Logger.info("  totalPlayTime: " + SaveLocation.formatPlayTime(this.my));
       }
 
       if (this.lL == 1) {
@@ -129,19 +129,19 @@ void write() {
    }
 
    void write(OutputStream var1) {
-      hk.AboutDialog(var1, this.lL);
-      hk.AboutDialog(var1, this.version);
-      hk.AboutDialogCloseListener(var1, this.my);
+      hk.writeInt(var1, this.lL);
+      hk.writeInt(var1, this.version);
+      hk.writeLong(var1, this.my);
       if (this.mB != null) {
-         hk.AboutDialog(var1, this.mz);
+         hk.writeInt(var1, this.mz);
          var1.write(this.mB);
       } else {
-         hk.AboutDialog(var1, this.mA);
-         gc.AccountPanel(var1, this.name);
-         gc.AccountPanel(var1, this.description);
+         hk.writeInt(var1, this.mA);
+         gc.writeUtf8FixedString(var1, this.name);
+         gc.writeUtf8FixedString(var1, this.description);
       }
 
-      hk.AboutDialog(var1, this.lM);
+      hk.writeInt(var1, this.lM);
    }
 
    byte[] co() {
@@ -212,7 +212,7 @@ long length() {
       return this.mh.length();
    }
 
-   void AboutDialog(fS var1) {
+   void copyFrom(fS var1) {
       this.lL = var1.lL;
       this.version = var1.version;
       this.my = var1.my;
diff --git a/nomanssave/fU.java b/nomanssave/fU.java
index 7726648..d9a1279 100644
--- a/nomanssave/fU.java
+++ b/nomanssave/fU.java
@@ -14,7 +14,7 @@ public JsonObject M() {
    }
 
    public void k(JsonObject var1) {
-      this.AboutDialog("msaccountdata", (GameMode)null);
+      this.writeHeader("msaccountdata", (GameMode)null);
       this.h(var1);
    }
 }
diff --git a/nomanssave/fV.java b/nomanssave/fV.java
index 7020fb3..f83f156 100644
--- a/nomanssave/fV.java
+++ b/nomanssave/fV.java
@@ -60,7 +60,7 @@ class fV implements SaveFile {
 
    }
 
-   void AboutDialog(FileOutputStream var1) {
+   void extractToStream(FileOutputStream var1) {
       ZipFile var2 = new ZipFile(this.mc);
 
       try {
@@ -99,15 +99,15 @@ public JsonObject M() {
       // $FF: Couldn't be decompiled
    }
 
-   public String AboutDialogCloseListener(JsonObject var1) {
+   public String writeToFile(JsonObject var1) {
       Logger.info("Writing new save file...");
       String var2;
-      if (XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.mb] != null) {
-         XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.mb].mZ.AboutDialog(this.mQ);
-         var2 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.mb].AboutDialogCloseListener(var1);
+      if (XboxSaveLocation.access$getSaveFiles(this.mN)[this.mb] != null) {
+         XboxSaveLocation.access$getSaveFiles(this.mN)[this.mb].mZ.extractToStream(this.mQ);
+         var2 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.mb].writeToFile(var1);
       } else {
-         XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.mb] = new fY(this.mN, this, var1);
-         var2 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.mb].K();
+         XboxSaveLocation.access$getSaveFiles(this.mN)[this.mb] = new fY(this.mN, this, var1);
+         var2 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.mb].K();
       }
 
       Logger.info("Finished.");
diff --git a/nomanssave/fW.java b/nomanssave/fW.java
index 36cb28a..0456cd0 100644
--- a/nomanssave/fW.java
+++ b/nomanssave/fW.java
@@ -22,11 +22,11 @@ class fW {
 
    fW(XboxSaveLocation var1, InputStream var2) {
       this.mN = var1;
-      this.name = gc.AccountPanel(var2);
+      this.name = gc.readUtf16String(var2);
       Logger.info("  " + this.name);
-      this.filename = gc.AccountPanel(var2);
+      this.filename = gc.readUtf16String(var2);
       Logger.debug("    filename: " + this.filename);
-      this.id = gc.AccountPanel(var2);
+      this.id = gc.readUtf16String(var2);
       Logger.debug("    id: " + this.id);
       this.mT = var2.read();
       if (this.mT < 0) {
@@ -38,9 +38,9 @@ class fW {
             Logger.debug("    unknown1: " + Integer.toHexString(this.lL));
          }
 
-         this.mU = gc.AboutDialog(var2);
+         this.mU = gc.readGuid(var2);
          Logger.debug("    containerPath: " + this.mU);
-         this.timestamp = gc.AboutDialogCloseListener(var2);
+         this.timestamp = gc.readFileTime(var2);
          Logger.debug("    timestamp: " + new Date(this.timestamp));
          this.mV = hk.f(var2);
          if (this.mV != 0L) {
@@ -70,15 +70,15 @@ class fW {
    }
 
    void write(OutputStream var1) {
-      gc.AboutDialogCloseListener(var1, this.name);
-      gc.AboutDialogCloseListener(var1, this.filename);
-      gc.AboutDialogCloseListener(var1, this.id);
+      gc.writeUtf16String(var1, this.name);
+      gc.writeUtf16String(var1, this.filename);
+      gc.writeUtf16String(var1, this.id);
       var1.write(this.mT);
-      hk.AboutDialog(var1, this.lL);
-      gc.AboutDialog(var1, this.mU);
-      gc.AboutDialog(var1, this.timestamp);
-      hk.AboutDialogCloseListener(var1, this.mV);
-      hk.AboutDialogCloseListener(var1, this.mW);
+      hk.writeInt(var1, this.lL);
+      gc.writeFileTime(var1, this.mU);
+      gc.writeFileTime(var1, this.timestamp);
+      hk.writeLong(var1, this.mV);
+      hk.writeLong(var1, this.mW);
    }
 
    String cz() {
diff --git a/nomanssave/fY.java b/nomanssave/fY.java
index 95ab157..497a7bb 100644
--- a/nomanssave/fY.java
+++ b/nomanssave/fY.java
@@ -24,7 +24,7 @@ class fY extends XboxContainerWriter implements SaveFile {
 
          this.me = GameMode.T(var3);
       } catch (IOException var5) {
-         Logger.AboutDialog("Could not read game mode from " + this.mO.name, var5);
+         Logger.error("Could not read game mode from " + this.mO.name, var5);
       }
 
    }
@@ -65,7 +65,7 @@ public JsonObject M() {
       return this.AboutDialog(eG.jV);
    }
 
-   public String AboutDialogCloseListener(JsonObject var1) {
+   public String writeToFile(JsonObject var1) {
       this.AboutDialog(this.lO == 0 ? "wgsbackup" : "wgsbackup" + (this.lO + 1), this.me);
       int var2 = XboxSaveLocation.ao(var1.J("Version"));
       if (var2 != 0) {
diff --git a/nomanssave/fZ.java b/nomanssave/fZ.java
index 7fed428..cd588a1 100644
--- a/nomanssave/fZ.java
+++ b/nomanssave/fZ.java
@@ -17,18 +17,18 @@ public int getIndex() {
    }
 
    public boolean isEmpty() {
-      return XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2] == null && XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1] == null;
+      return XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2] == null && XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1] == null;
    }
 
    public SaveFile[] bX() {
       Logger.info("Loading saves for Slot " + (this.lT + 1) + "...");
       ArrayList var1 = new ArrayList();
-      if (XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2] != null) {
-         var1.add(XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2]);
+      if (XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2] != null) {
+         var1.add(XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2]);
       }
 
-      if (XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1] != null) {
-         var1.add(XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1]);
+      if (XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1] != null) {
+         var1.add(XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1]);
       }
 
       AppSettings.cG.listFiles(new ga(this, var1));
@@ -39,15 +39,15 @@ public SaveFile[] bX() {
    public GameMode L() {
       long var1 = Long.MIN_VALUE;
       GameMode var3 = null;
-      if (XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2] != null) {
-         var3 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2].L();
-         var1 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2].lastModified();
+      if (XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2] != null) {
+         var3 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2].L();
+         var1 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2].lastModified();
       }
 
-      if (XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1] != null) {
-         long var4 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1].lastModified();
+      if (XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1] != null) {
+         long var4 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1].lastModified();
          if (var4 > var1) {
-            var3 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1].L();
+            var3 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1].L();
          }
       }
 
@@ -59,15 +59,15 @@ public String toString() {
       var1.append("Slot " + (this.lT + 1) + " - ");
       long var2 = Long.MIN_VALUE;
       GameMode var4 = null;
-      if (XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2] != null) {
-         var4 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2].L();
-         var2 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2].lastModified();
+      if (XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2] != null) {
+         var4 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2].L();
+         var2 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2].lastModified();
       }
 
-      if (XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1] != null) {
-         long var5 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1].lastModified();
+      if (XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1] != null) {
+         long var5 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1].lastModified();
          if (var5 > var2) {
-            var4 = XboxSaveLocation.AboutDialogCloseListener(this.mN)[this.lT * 2 + 1].L();
+            var4 = XboxSaveLocation.access$getSaveFiles(this.mN)[this.lT * 2 + 1].L();
             var2 = var5;
          }
       }
@@ -83,7 +83,7 @@ public String toString() {
    }
 
    // $FF: synthetic method
-   static XboxSaveLocation AboutDialog(fZ var0) {
+   static XboxSaveLocation access$getXboxSaveLocation(fZ var0) {
       return var0.mN;
    }
 }
diff --git a/nomanssave/fi.java b/nomanssave/fi.java
index a239435..0051f1f 100644
--- a/nomanssave/fi.java
+++ b/nomanssave/fi.java
@@ -39,7 +39,7 @@ public int read() {
       return var1;
    }
 
-   private int AboutDialog(Predicate var1) {
+   private int readWhile(Predicate var1) {
       try {
          this.mark(1);
          int var2 = super.read();
@@ -60,7 +60,7 @@ private int AboutDialog(Predicate var1) {
    }
 
    // $FF: synthetic method
-   static int AboutDialog(fi var0, Predicate var1) {
-      return var0.AboutDialog(var1);
+   static int access$readWhile(fi var0, Predicate var1) {
+      return var0.readWhile(var1);
    }
 }
diff --git a/nomanssave/fp.java b/nomanssave/fp.java
index 75a4c78..a8b4a06 100644
--- a/nomanssave/fp.java
+++ b/nomanssave/fp.java
@@ -7,5 +7,5 @@ public interface fp {
 
    JsonObject M();
 
-   String AboutDialogCloseListener(JsonObject var1);
+   String writeToFile(JsonObject var1);
 }
diff --git a/nomanssave/fu.java b/nomanssave/fu.java
index 1577801..959c87a 100644
--- a/nomanssave/fu.java
+++ b/nomanssave/fu.java
@@ -135,7 +135,7 @@ public static void main(String[] var0) {
       new fu(new File("D:\\Temp\\PS4_NEW"), (SaveChangeListener)null);
    }
 
-   private static boolean AboutDialog(byte[] var0, byte[] var1) {
+   private static boolean bytesEqual(byte[] var0, byte[] var1) {
       for(int var2 = 0; var2 < var0.length; ++var2) {
          if (var0[var2] != var1[var2]) {
             return false;
@@ -146,7 +146,7 @@ private static boolean AboutDialog(byte[] var0, byte[] var1) {
    }
 
    // $FF: synthetic method
-   static fx[] AboutDialog(fu var0) {
+   static fx[] access$getSaveFiles(fu var0) {
       return var0.lH;
    }
 
@@ -156,17 +156,17 @@ static byte[] bY() {
    }
 
    // $FF: synthetic method
-   static boolean AboutDialogCloseListener(byte[] var0, byte[] var1) {
-      return AboutDialog(var0, var1);
+   static boolean access$bytesEqual(byte[] var0, byte[] var1) {
+      return bytesEqual(var0, var1);
    }
 
    // $FF: synthetic method
-   static File AboutDialogCloseListener(fu var0) {
+   static File access$getFile(fu var0) {
       return var0.lD;
    }
 
    // $FF: synthetic method
-   static fw[] AccountPanel(fu var0) {
+   static fw[] access$getContainers(fu var0) {
       return var0.lF;
    }
 }
diff --git a/nomanssave/fw.java b/nomanssave/fw.java
index a08b99d..219bef6 100644
--- a/nomanssave/fw.java
+++ b/nomanssave/fw.java
@@ -42,21 +42,21 @@ class fw {
    }
 
    boolean isValid() {
-      return fu.AboutDialogCloseListener(this.lK, fu.bY()) && this.lO >= 0;
+      return fu.access$bytesEqual(this.lK, fu.bY()) && this.lO >= 0;
    }
 
-   int AboutDialog(OutputStream var1) {
+   int writeTo(OutputStream var1) {
       var1.write(this.lK);
-      hk.AboutDialog(var1, this.lL);
-      hk.AboutDialog(var1, this.lM);
-      hk.AboutDialog(var1, this.lN);
-      hk.AboutDialog(var1, this.lO);
-      hk.AboutDialog(var1, (int)(this.FreighterPanel / 1000L));
-      hk.AboutDialog(var1, (int)this.length);
-      hk.AboutDialog(var1, (int)this.lP);
-      hk.AboutDialog(var1, this.lQ);
-      hk.AboutDialog(var1, this.lR);
-      hk.AboutDialog(var1, this.lS);
+      hk.writeInt(var1, this.lL);
+      hk.writeInt(var1, this.lM);
+      hk.writeInt(var1, this.lN);
+      hk.writeInt(var1, this.lO);
+      hk.writeInt(var1, (int)(this.FreighterPanel / 1000L));
+      hk.writeInt(var1, (int)this.length);
+      hk.writeInt(var1, (int)this.lP);
+      hk.writeInt(var1, this.lQ);
+      hk.writeInt(var1, this.lR);
+      hk.writeInt(var1, this.lS);
       return 48;
    }
 
@@ -83,7 +83,7 @@ byte[] ca() {
       if (!this.isValid()) {
          return null;
       } else {
-         FileInputStream var1 = new FileInputStream(fu.AboutDialogCloseListener(this.lJ));
+         FileInputStream var1 = new FileInputStream(fu.access$getFile(this.lJ));
 
          byte[] var8;
          try {
@@ -117,8 +117,8 @@ void d(byte[] var1) {
       } else {
          int var2 = -1;
 
-         for(int var3 = 0; var3 < fu.AccountPanel(this.lJ).length; ++var3) {
-            if (fu.AccountPanel(this.lJ)[var3] == this) {
+         for(int var3 = 0; var3 < fu.access$getContainers(this.lJ).length; ++var3) {
+            if (fu.access$getContainers(this.lJ)[var3] == this) {
                var2 = var3;
                break;
             }
@@ -128,46 +128,46 @@ void d(byte[] var1) {
             throw new IOException("header not valid");
          } else {
             long var25 = System.currentTimeMillis();
-            File var5 = new File(fu.AboutDialogCloseListener(this.lJ).getParentFile(), "~" + fu.AboutDialogCloseListener(this.lJ).getName());
+            File var5 = new File(fu.access$getFile(this.lJ).getParentFile(), "~" + fu.access$getFile(this.lJ).getName());
             FileOutputStream var6 = new FileOutputStream(var5);
 
             try {
-               FileInputStream var7 = new FileInputStream(fu.AboutDialogCloseListener(this.lJ));
+               FileInputStream var7 = new FileInputStream(fu.access$getFile(this.lJ));
 
                try {
                   System.out.println("Reading header");
                   byte[] var8 = new byte[64];
                   hk.readFully(var7, var8);
                   var6.write(var8);
-                  long var9 = (long)var1.length - fu.AccountPanel(this.lJ)[var2].length;
+                  long var9 = (long)var1.length - fu.access$getContainers(this.lJ)[var2].length;
                   long var11 = 64L;
 
                   int var13;
                   fw var10000;
                   for(var13 = 0; var13 < var2; ++var13) {
-                     if (fu.AccountPanel(this.lJ)[var13].lP < fu.AccountPanel(this.lJ)[var2].lP) {
-                        var10000 = fu.AccountPanel(this.lJ)[var13];
+                     if (fu.access$getContainers(this.lJ)[var13].lP < fu.access$getContainers(this.lJ)[var2].lP) {
+                        var10000 = fu.access$getContainers(this.lJ)[var13];
                         var10000.lP += var9;
                      }
 
-                     var11 += (long)fu.AccountPanel(this.lJ)[var13].AboutDialog(var6);
+                     var11 += (long)fu.access$getContainers(this.lJ)[var13].AboutDialog(var6);
                   }
 
                   var6.write(fu.bY());
-                  fu.AccountPanel(this.lJ)[var2].length = (long)var1.length;
-                  fu.AccountPanel(this.lJ)[var2].FreighterPanel = var25;
-                  var11 += (long)fu.AccountPanel(this.lJ)[var2].AboutDialog(var6);
+                  fu.access$getContainers(this.lJ)[var2].length = (long)var1.length;
+                  fu.access$getContainers(this.lJ)[var2].FreighterPanel = var25;
+                  var11 += (long)fu.access$getContainers(this.lJ)[var2].AboutDialog(var6);
 
-                  for(var13 = var2 + 1; var13 < fu.AccountPanel(this.lJ).length; ++var13) {
-                     if (fu.AccountPanel(this.lJ)[var13].lP < fu.AccountPanel(this.lJ)[var2].lP) {
-                        var10000 = fu.AccountPanel(this.lJ)[var13];
+                  for(var13 = var2 + 1; var13 < fu.access$getContainers(this.lJ).length; ++var13) {
+                     if (fu.access$getContainers(this.lJ)[var13].lP < fu.access$getContainers(this.lJ)[var2].lP) {
+                        var10000 = fu.access$getContainers(this.lJ)[var13];
                         var10000.lP += var9;
                      }
 
-                     var11 += (long)fu.AccountPanel(this.lJ)[var13].AboutDialog(var6);
+                     var11 += (long)fu.access$getContainers(this.lJ)[var13].AboutDialog(var6);
                   }
 
-                  long var26 = fu.AccountPanel(this.lJ)[var2].lP - var11;
+                  long var26 = fu.access$getContainers(this.lJ)[var2].lP - var11;
 
                   byte[] var15;
                   int var16;
diff --git a/nomanssave/fx.java b/nomanssave/fx.java
index 534fd00..981bb17 100644
--- a/nomanssave/fx.java
+++ b/nomanssave/fx.java
@@ -72,7 +72,7 @@ public JsonObject M() {
       }
    }
 
-   public String AboutDialogCloseListener(JsonObject var1) {
+   public String writeToFile(JsonObject var1) {
       ByteArrayOutputStream var2 = new ByteArrayOutputStream();
       Throwable var3 = null;
       Object var4 = null;
diff --git a/nomanssave/fy.java b/nomanssave/fy.java
index ad5d8d0..1f92061 100644
--- a/nomanssave/fy.java
+++ b/nomanssave/fy.java
@@ -17,21 +17,21 @@ public int getIndex() {
    }
 
    public boolean isEmpty() {
-      return fu.AboutDialog(this.lJ)[this.lT * 2] == null && fu.AboutDialog(this.lJ)[this.lT * 2 + 1] == null;
+      return fu.access$getSaveFiles(this.lJ)[this.lT * 2] == null && fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1] == null;
    }
 
    public GameMode L() {
       long var1 = Long.MIN_VALUE;
       GameMode var3 = null;
-      if (fu.AboutDialog(this.lJ)[this.lT * 2] != null) {
-         var3 = fu.AboutDialog(this.lJ)[this.lT * 2].L();
-         var1 = fu.AboutDialog(this.lJ)[this.lT * 2].lastModified();
+      if (fu.access$getSaveFiles(this.lJ)[this.lT * 2] != null) {
+         var3 = fu.access$getSaveFiles(this.lJ)[this.lT * 2].L();
+         var1 = fu.access$getSaveFiles(this.lJ)[this.lT * 2].lastModified();
       }
 
-      if (fu.AboutDialog(this.lJ)[this.lT * 2 + 1] != null) {
-         long var4 = fu.AboutDialog(this.lJ)[this.lT * 2 + 1].lastModified();
+      if (fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1] != null) {
+         long var4 = fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1].lastModified();
          if (var4 > var1) {
-            var3 = fu.AboutDialog(this.lJ)[this.lT * 2 + 1].L();
+            var3 = fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1].L();
          }
       }
 
@@ -41,12 +41,12 @@ public GameMode L() {
    public SaveFile[] bX() {
       Logger.info("Loading saves for Slot " + (this.lT + 1) + "...");
       ArrayList var1 = new ArrayList();
-      if (fu.AboutDialog(this.lJ)[this.lT * 2] != null) {
-         var1.add(fu.AboutDialog(this.lJ)[this.lT * 2]);
+      if (fu.access$getSaveFiles(this.lJ)[this.lT * 2] != null) {
+         var1.add(fu.access$getSaveFiles(this.lJ)[this.lT * 2]);
       }
 
-      if (fu.AboutDialog(this.lJ)[this.lT * 2 + 1] != null) {
-         var1.add(fu.AboutDialog(this.lJ)[this.lT * 2 + 1]);
+      if (fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1] != null) {
+         var1.add(fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1]);
       }
 
       var1.sort(new fz(this));
@@ -58,15 +58,15 @@ public String toString() {
       var1.append("Slot " + (this.lT + 1) + " - ");
       long var2 = Long.MIN_VALUE;
       GameMode var4 = null;
-      if (fu.AboutDialog(this.lJ)[this.lT * 2] != null) {
-         var4 = fu.AboutDialog(this.lJ)[this.lT * 2].L();
-         var2 = fu.AboutDialog(this.lJ)[this.lT * 2].lastModified();
+      if (fu.access$getSaveFiles(this.lJ)[this.lT * 2] != null) {
+         var4 = fu.access$getSaveFiles(this.lJ)[this.lT * 2].L();
+         var2 = fu.access$getSaveFiles(this.lJ)[this.lT * 2].lastModified();
       }
 
-      if (fu.AboutDialog(this.lJ)[this.lT * 2 + 1] != null) {
-         long var5 = fu.AboutDialog(this.lJ)[this.lT * 2 + 1].lastModified();
+      if (fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1] != null) {
+         long var5 = fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1].lastModified();
          if (var5 > var2) {
-            var4 = fu.AboutDialog(this.lJ)[this.lT * 2 + 1].L();
+            var4 = fu.access$getSaveFiles(this.lJ)[this.lT * 2 + 1].L();
             var2 = var5;
          }
       }
diff --git a/nomanssave/fz.java b/nomanssave/fz.java
index ddec0fa..498f8c2 100644
--- a/nomanssave/fz.java
+++ b/nomanssave/fz.java
@@ -10,7 +10,7 @@ class fz implements Comparator {
       this.lU = var1;
    }
 
-   public int AboutDialog(SaveFile var1, SaveFile var2) {
+   public int compare(SaveFile var1, SaveFile var2) {
       long var3 = var2.lastModified() - var1.lastModified();
       if (var3 < -2147483648L) {
          return Integer.MIN_VALUE;
@@ -21,6 +21,6 @@ public int AboutDialog(SaveFile var1, SaveFile var2) {
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((SaveFile)var1, (SaveFile)var2);
+      return this.compare((SaveFile)var1, (SaveFile)var2);
    }
 }
diff --git a/nomanssave/gA.java b/nomanssave/gA.java
index f6930b2..cb9e619 100644
--- a/nomanssave/gA.java
+++ b/nomanssave/gA.java
@@ -16,7 +16,7 @@ public String getID() {
       return this.rd.getID();
    }
 
-   public boolean AccountPanel(Race var1) {
+   public boolean hasRecipeForRace(Race var1) {
       Iterator var3 = this.rd.bw().iterator();
 
       while(var3.hasNext()) {
@@ -29,7 +29,7 @@ public boolean AccountPanel(Race var1) {
       return false;
    }
 
-   public void AboutDialog(Race var1, boolean var2) {
+   public void setRecipeEnabled(Race var1, boolean var2) {
       Iterator var4 = this.rd.bw().iterator();
 
       while(var4.hasNext()) {
diff --git a/nomanssave/gF.java b/nomanssave/gF.java
index 0a09bda..30a6db4 100644
--- a/nomanssave/gF.java
+++ b/nomanssave/gF.java
@@ -24,8 +24,8 @@ public Object dz() {
    }
 
    public void m(Object var1) {
-      this.kM.AboutDialogCloseListener("ElementId", var1);
-      this.kM.AboutDialogCloseListener("LastChangeTimestamp", (Object)((int)(System.currentTimeMillis() / 1000L)));
+      this.kM.setValueByPath("ElementId", var1);
+      this.kM.setValueByPath("LastChangeTimestamp", (Object)((int)(System.currentTimeMillis() / 1000L)));
    }
 
    public int dA() {
@@ -33,8 +33,8 @@ public int dA() {
    }
 
    public void aA(int var1) {
-      this.kM.AboutDialogCloseListener("Amount", (Object)var1);
-      this.kM.AboutDialogCloseListener("LastChangeTimestamp", (Object)((int)(System.currentTimeMillis() / 1000L)));
+      this.kM.setValueByPath("Amount", (Object)var1);
+      this.kM.setValueByPath("LastChangeTimestamp", (Object)((int)(System.currentTimeMillis() / 1000L)));
    }
 
    public int dB() {
diff --git a/nomanssave/gI.java b/nomanssave/gI.java
index 1306600..68ae3f2 100644
--- a/nomanssave/gI.java
+++ b/nomanssave/gI.java
@@ -18,7 +18,7 @@ class gI extends Inventory {
    }
 
    public int MultitoolPanel() {
-      return this.rr ? 3584 : 3584 | Starship.AboutDialogCloseListener(this.rq);
+      return this.rr ? 3584 : 3584 | Starship.show(this.rq);
    }
 
    public String toString() {
diff --git a/nomanssave/gJ.java b/nomanssave/gJ.java
index 867db52..184fad6 100644
--- a/nomanssave/gJ.java
+++ b/nomanssave/gJ.java
@@ -15,7 +15,7 @@ class gJ extends Inventory {
    }
 
    public int MultitoolPanel() {
-      return Starship.AboutDialogCloseListener(this.rq);
+      return Starship.show(this.rq);
    }
 
    public String toString() {
diff --git a/nomanssave/gV.java b/nomanssave/gV.java
index 7e77b38..52fbd84 100644
--- a/nomanssave/gV.java
+++ b/nomanssave/gV.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 public class gV {
-   private static double[] AboutDialog(JsonObject var0, String var1) {
+   private static double[] readCoords(JsonObject var0, String var1) {
       JsonArray var2 = var0.d(var1);
       if (var2.size() != 3) {
          throw new RuntimeException("Invalid " + var1 + " coordinates");
@@ -14,15 +14,15 @@ private static double[] AboutDialog(JsonObject var0, String var1) {
       }
    }
 
-   private static void AboutDialog(JsonObject var0, String var1, double[] var2) {
+   private static void writeCoords(JsonObject var0, String var1, double[] var2) {
       var0.AboutDialogCloseListener(var1, (Object)(new JsonArray(new Object[]{new Double(Double.isNaN(var2[0]) ? 0.0D : var2[0]), new Double(Double.isNaN(var2[1]) ? 0.0D : var2[1]), new Double(Double.isNaN(var2[2]) ? 0.0D : var2[2])})));
    }
 
    public static boolean InMemorySaveFile(JsonObject var0) {
-      return AboutDialogCloseListener(var0, "^BUILDSIGNAL");
+      return moveObject(var0, "^BUILDSIGNAL");
    }
 
-   public static boolean AboutDialogCloseListener(JsonObject var0, String var1) {
+   public static boolean moveObject(JsonObject var0, String var1) {
       JsonArray var2 = var0.d("Objects");
       JsonObject var3 = null;
       JsonObject var4 = null;
@@ -53,7 +53,7 @@ public static boolean AboutDialogCloseListener(JsonObject var0, String var1) {
          Logger.warn("  no " + var1 + " object found");
          return false;
       } else {
-         AboutDialog(var0, var3, var4);
+         transferPosition(var0, var3, var4);
          return true;
       }
    }
@@ -80,7 +80,7 @@ public static List ValidatedTextField(JsonObject var0) {
       return (List)(var2 ? var1 : Collections.emptyList());
    }
 
-   public static boolean AboutDialog(JsonObject var0, JsonObject var1) {
+   public static boolean swapObject(JsonObject var0, JsonObject var1) {
       JsonArray var2 = var0.d("Objects");
       boolean var3 = false;
       JsonObject var4 = null;
@@ -106,37 +106,37 @@ public static boolean AboutDialog(JsonObject var0, JsonObject var1) {
          Logger.warn("  replacement object found");
          return false;
       } else {
-         AboutDialog(var0, var4, var1);
+         transferPosition(var0, var4, var1);
          return true;
       }
    }
 
-   private static void AboutDialog(JsonObject var0, JsonObject var1, JsonObject var2) {
-      double[] var3 = AboutDialog(var0, "Position");
-      double[] var4 = AboutDialog(var0, "Forward");
-      double[] var5 = AboutDialog(var2, "Position");
+   private static void transferPosition(JsonObject var0, JsonObject var1, JsonObject var2) {
+      double[] var3 = readCoords(var0, "Position");
+      double[] var4 = readCoords(var0, "Forward");
+      double[] var5 = readCoords(var2, "Position");
       CoordinateTransform var6 = new CoordinateTransform(var3, var4);
       double[] var7 = var6.AccountPanel(var5);
       var7[0] += var3[0];
       var7[1] += var3[1];
       var7[2] += var3[2];
-      AboutDialog(var0, "Position", var7);
-      var7 = AboutDialog(var1, "At");
-      double[] var8 = AboutDialog(var2, "At");
-      AboutDialog(var1, "At", var8);
-      AboutDialog(var2, "At", var7);
+      writeCoords(var0, "Position", var7);
+      var7 = readCoords(var1, "At");
+      double[] var8 = readCoords(var2, "At");
+      writeCoords(var1, "At", var8);
+      writeCoords(var2, "At", var7);
       var7 = new double[]{-var5[0], -var5[1], -var5[2]};
-      AboutDialog(var2, "Position", var7);
+      writeCoords(var2, "Position", var7);
       JsonArray var9 = var0.d("Objects");
 
       for(int var10 = 0; var10 < var9.size(); ++var10) {
          JsonObject var11 = var9.V(var10);
          if (var11 != var1 && var11 != var2) {
-            var7 = AboutDialog(var11, "Position");
+            var7 = readCoords(var11, "Position");
             var7[0] -= var5[0];
             var7[1] -= var5[1];
             var7[2] -= var5[2];
-            AboutDialog(var11, "Position", var7);
+            writeCoords(var11, "Position", var7);
          }
       }
 
diff --git a/nomanssave/gW.java b/nomanssave/gW.java
index 2fd7faa..f76dc02 100644
--- a/nomanssave/gW.java
+++ b/nomanssave/gW.java
@@ -39,7 +39,7 @@ public static void i(byte[] var0) {
       System.out.println(var1.toString());
    }
 
-   public static void AboutDialog(long[] var0) {
+   public static void hashToBytes(long[] var0) {
       byte[] var1 = new byte[var0.length * 4];
 
       for(int var2 = 0; var2 < var0.length; ++var2) {
diff --git a/nomanssave/gX.java b/nomanssave/gX.java
index 314ef9a..ec0e8c4 100644
--- a/nomanssave/gX.java
+++ b/nomanssave/gX.java
@@ -52,7 +52,7 @@ public int read(byte[] var1, int var2, int var3) {
    }
 
    // $FF: synthetic method
-   static InputStream AboutDialog(gX var0) {
+   static InputStream access$getInputStream(gX var0) {
       return var0.in;
    }
 }
diff --git a/nomanssave/gY.java b/nomanssave/gY.java
index 5678e2f..a556d51 100644
--- a/nomanssave/gY.java
+++ b/nomanssave/gY.java
@@ -17,7 +17,7 @@ public int read() {
       if (this.sc == 0) {
          return -1;
       } else {
-         int var1 = gX.AboutDialog(this.sd).read();
+         int var1 = gX.access$getInputStream(this.sd).read();
          if (var1 < 0) {
             throw new IOException("short read");
          } else {
@@ -39,7 +39,7 @@ public int read(byte[] var1, int var2, int var3) {
             var3 = this.sc;
          }
 
-         var3 = gX.AboutDialog(this.sd).read(var1, var2, var3);
+         var3 = gX.access$getInputStream(this.sd).read(var1, var2, var3);
          if (var3 <= 0) {
             throw new IOException("short read");
          } else {
diff --git a/nomanssave/ga.java b/nomanssave/ga.java
index 27711e3..e3928d9 100644
--- a/nomanssave/ga.java
+++ b/nomanssave/ga.java
@@ -23,9 +23,9 @@ public boolean accept(File var1) {
          int var3 = var2.group(1).length() == 0 ? 0 : Integer.parseInt(var2.group(1)) - 1;
          if (var3 / 2 == this.nb.lT) {
             try {
-               this.mg.add(new fV(fZ.AboutDialog(this.nb), var1.getName(), var3));
+               this.mg.add(new fV(fZ.access$getXboxSaveLocation(this.nb), var1.getName(), var3));
             } catch (IOException var5) {
-               Logger.AboutDialog("Cannot load " + var1.getName(), var5);
+               Logger.error("Cannot load " + var1.getName(), var5);
             }
          }
       }
diff --git a/nomanssave/gb.java b/nomanssave/gb.java
index c1a18fe..c96d860 100644
--- a/nomanssave/gb.java
+++ b/nomanssave/gb.java
@@ -10,7 +10,7 @@ class gb implements Comparator {
       this.nb = var1;
    }
 
-   public int AboutDialog(SaveFile var1, SaveFile var2) {
+   public int compare(SaveFile var1, SaveFile var2) {
       long var3 = var2.lastModified() - var1.lastModified();
       if (var3 < -2147483648L) {
          return Integer.MIN_VALUE;
@@ -21,6 +21,6 @@ public int AboutDialog(SaveFile var1, SaveFile var2) {
 
    // $FF: synthetic method
    public int compare(Object var1, Object var2) {
-      return this.AboutDialog((SaveFile)var1, (SaveFile)var2);
+      return this.compare((SaveFile)var1, (SaveFile)var2);
    }
 }
diff --git a/nomanssave/gc.java b/nomanssave/gc.java
index ef7a3ca..d128219 100644
--- a/nomanssave/gc.java
+++ b/nomanssave/gc.java
@@ -8,7 +8,7 @@
 public class gc {
    private static final long nc = -11644473600000L;
 
-   public static String AboutDialog(InputStream var0) {
+   public static String readGuid(InputStream var0) {
       byte[] var1 = new byte[16];
       hk.readFully(var0, var1);
       return h(var1);
@@ -22,33 +22,33 @@ public static String cA() {
 
    private static String h(byte[] var0) {
       StringBuilder var1 = new StringBuilder();
-      AboutDialog(var0[3], var1);
-      AboutDialog(var0[2], var1);
-      AboutDialog(var0[1], var1);
-      AboutDialog(var0[0], var1);
-      AboutDialog(var0[5], var1);
-      AboutDialog(var0[4], var1);
-      AboutDialog(var0[7], var1);
-      AboutDialog(var0[6], var1);
-      AboutDialog(var0[8], var1);
-      AboutDialog(var0[9], var1);
-      AboutDialog(var0[10], var1);
-      AboutDialog(var0[11], var1);
-      AboutDialog(var0[12], var1);
-      AboutDialog(var0[13], var1);
-      AboutDialog(var0[14], var1);
-      AboutDialog(var0[15], var1);
+      appendByteHex(var0[3], var1);
+      appendByteHex(var0[2], var1);
+      appendByteHex(var0[1], var1);
+      appendByteHex(var0[0], var1);
+      appendByteHex(var0[5], var1);
+      appendByteHex(var0[4], var1);
+      appendByteHex(var0[7], var1);
+      appendByteHex(var0[6], var1);
+      appendByteHex(var0[8], var1);
+      appendByteHex(var0[9], var1);
+      appendByteHex(var0[10], var1);
+      appendByteHex(var0[11], var1);
+      appendByteHex(var0[12], var1);
+      appendByteHex(var0[13], var1);
+      appendByteHex(var0[14], var1);
+      appendByteHex(var0[15], var1);
       return var1.toString();
    }
 
-   private static void AboutDialog(byte var0, StringBuilder var1) {
+   private static void appendByteHex(byte var0, StringBuilder var1) {
       int var2 = (240 & var0) >> 4;
       int var3 = 15 & var0;
       var1.append("0123456789ABCDEF".charAt(var2));
       var1.append("0123456789ABCDEF".charAt(var3));
    }
 
-   public static void AboutDialog(OutputStream var0, String var1) {
+   public static void writeGuid(OutputStream var0, String var1) {
       if (var1.length() > 32) {
          throw new IOException("invalid container path");
       } else {
@@ -62,15 +62,15 @@ public static void AboutDialog(OutputStream var0, String var1) {
       }
    }
 
-   public static long AboutDialogCloseListener(InputStream var0) {
+   public static long readFileTime(InputStream var0) {
       return hk.f(var0) / 10000L + -11644473600000L;
    }
 
-   public static void AboutDialog(OutputStream var0, long var1) {
-      hk.AboutDialogCloseListener(var0, (var1 - -11644473600000L) * 10000L);
+   public static void writeFileTime(OutputStream var0, long var1) {
+      hk.writeLong(var0, (var1 - -11644473600000L) * 10000L);
    }
 
-   public static String AccountPanel(InputStream var0) {
+   public static String readUtf16String(InputStream var0) {
       int var1 = hk.readInt(var0);
       if (var1 < 0) {
          throw new IOException("negative length");
@@ -81,8 +81,8 @@ public static String AccountPanel(InputStream var0) {
       }
    }
 
-   public static void AboutDialogCloseListener(OutputStream var0, String var1) {
-      hk.AboutDialog(var0, var1.length());
+   public static void writeUtf16String(OutputStream var0, String var1) {
+      hk.writeInt(var0, var1.length());
       var0.write(var1.getBytes("UTF-16LE"));
    }
 
@@ -108,7 +108,7 @@ public static String e(InputStream var0) {
       return new String(var1, 0, var2, "UTF-8");
    }
 
-   public static void AccountPanel(OutputStream var0, String var1) {
+   public static void writeUtf8FixedString(OutputStream var0, String var1) {
       byte[] var2 = var1.getBytes("UTF-8");
       if (var2.length < 128) {
          byte[] var3 = new byte[128];
diff --git a/nomanssave/gu.java b/nomanssave/gu.java
index 6ea2adf..b61645c 100644
--- a/nomanssave/gu.java
+++ b/nomanssave/gu.java
@@ -19,7 +19,7 @@ public Object dz() {
    }
 
    public void m(Object var1) {
-      this.qD.AboutDialogCloseListener("Id", var1);
+      this.qD.setValueByPath("Id", var1);
    }
 
    public int dA() {
@@ -27,7 +27,7 @@ public int dA() {
    }
 
    public void aA(int var1) {
-      this.qD.AboutDialogCloseListener("Amount", (Object)(new Integer(var1)));
+      this.qD.setValueByPath("Amount", (Object)(new Integer(var1)));
    }
 
    public int dB() {
@@ -38,8 +38,8 @@ public double dC() {
       return this.qD.L("DamageFactor");
    }
 
-   public void AccountPanel(double var1) {
-      this.qD.AboutDialogCloseListener("DamageFactor", (Object)(new Double(var1)));
+   public void setDamageFactor(double var1) {
+      this.qD.setValueByPath("DamageFactor", (Object)(new Double(var1)));
    }
 
    public boolean dD() {
@@ -47,7 +47,7 @@ public boolean dD() {
    }
 
    public void e(boolean var1) {
-      this.qD.AboutDialogCloseListener("FullyInstalled", (Object)(new Boolean(var1)));
+      this.qD.setValueByPath("FullyInstalled", (Object)(new Boolean(var1)));
    }
 
    // $FF: synthetic method
diff --git a/nomanssave/gw.java b/nomanssave/gw.java
index c5866dd..10e955f 100644
--- a/nomanssave/gw.java
+++ b/nomanssave/gw.java
@@ -13,7 +13,7 @@ public String getName() {
    }
 
    public void setName(String var1) {
-      this.oI.AboutDialogCloseListener("PlayerWeaponName", (Object)var1);
+      this.oI.setValueByPath("PlayerWeaponName", (Object)var1);
    }
 
    public String cT() {
@@ -30,7 +30,7 @@ public MultitoolType dI() {
       return MultitoolType.qH;
    }
 
-   public void AboutDialog(MultitoolType var1) {
+   public void setType(MultitoolType var1) {
       if (var1 != MultitoolType.qH) {
          throw new RuntimeException("Only standard types allowed");
       }
@@ -49,7 +49,7 @@ public String LineNumberPanel() {
    }
 
    public void aj(String var1) {
-      this.oI.AboutDialogCloseListener("WeaponInventory.Class.InventoryClass", (Object)var1);
+      this.oI.setValueByPath("WeaponInventory.Class.InventoryClass", (Object)var1);
    }
 
    public String toString() {
diff --git a/nomanssave/h.java b/nomanssave/h.java
index 02a9d46..c39ed4a 100644
--- a/nomanssave/h.java
+++ b/nomanssave/h.java
@@ -87,16 +87,16 @@ private h(Frame var1) {
       this.pack();
    }
 
-   private void AboutDialog() {
+   private void refreshCategoryFilter() {
       this.t = (List)this.s.stream().map(ItemDefinition::FormPanel).distinct().sorted((var0, var1) -> {
          return var0.name().compareTo(var1.name());
       }).collect(Collectors.toList());
       this.o.setSelectedIndex(this.t.size() == 1 ? 0 : -1);
       this.o.updateUI();
-      this.AboutDialogCloseListener();
+      this.refreshSubcategoryFilter();
    }
 
-   private void AboutDialogCloseListener() {
+   private void refreshSubcategoryFilter() {
       eB var1 = (eB)this.o.getSelectedItem();
       this.u = (List)this.s.stream().filter((var1x) -> {
          return var1x.FormPanel() == var1;
@@ -105,10 +105,10 @@ private void AboutDialogCloseListener() {
       }).collect(Collectors.toList());
       this.p.setSelectedIndex(this.u.size() == 1 ? 0 : -1);
       this.p.updateUI();
-      this.AccountPanel();
+      this.refreshItemList();
    }
 
-   private void AccountPanel() {
+   private void refreshItemList() {
       eB var1 = (eB)this.o.getSelectedItem();
       ex var2 = (ex)this.p.getSelectedItem();
       this.RefreshRunnable = (List)this.s.stream().filter((var2x) -> {
@@ -120,43 +120,43 @@ private void AccountPanel() {
       this.q.updateUI();
    }
 
-   private ItemDefinition AboutDialog(int var1) {
+   private ItemDefinition showDialog(int var1) {
       this.r = var1;
       this.s = ItemDefinition.AboutDialogCloseListener(var1, this.m.getText());
-      this.AboutDialog();
+      this.refreshCategoryFilter();
       this.l = null;
       this.setLocationRelativeTo(this.getParent());
       this.setVisible(true);
       return this.l;
    }
 
-   public static ItemDefinition AboutDialog(Container var0, int var1) {
+   public static ItemDefinition show(Container var0, int var1) {
       if (AppStartupRunnable == null) {
          Frame var2 = JOptionPane.getFrameForComponent(var0);
          AppStartupRunnable = new h(var2);
       }
 
-      return AppStartupRunnable.AboutDialog(var1);
+      return AppStartupRunnable.showDialog(var1);
    }
 
    // $FF: synthetic method
-   static JTextField AboutDialog(h var0) {
+   static JTextField access$getTextField(h var0) {
       return var0.m;
    }
 
    // $FF: synthetic method
-   static int AboutDialogCloseListener(h var0) {
+   static int access$getTypeFilter(h var0) {
       return var0.r;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(h var0, List var1) {
+   static void access$setFilteredItems(h var0, List var1) {
       var0.s = var1;
    }
 
    // $FF: synthetic method
-   static void AccountPanel(h var0) {
-      var0.AboutDialog();
+   static void access$refreshCategoryFilter(h var0) {
+      var0.refreshCategoryFilter();
    }
 
    // $FF: synthetic method
@@ -171,7 +171,7 @@ static List e(h var0) {
 
    // $FF: synthetic method
    static void f(h var0) {
-      var0.AboutDialogCloseListener();
+      var0.refreshSubcategoryFilter();
    }
 
    // $FF: synthetic method
@@ -181,7 +181,7 @@ static List g(h var0) {
 
    // $FF: synthetic method
    static void h(h var0) {
-      var0.AccountPanel();
+      var0.refreshItemList();
    }
 
    // $FF: synthetic method
@@ -195,7 +195,7 @@ static JComboBox j(h var0) {
    }
 
    // $FF: synthetic method
-   static void AboutDialog(h var0, ItemDefinition var1) {
+   static void access$setSelectedItem(h var0, ItemDefinition var1) {
       var0.l = var1;
    }
 }
diff --git a/nomanssave/hd.java b/nomanssave/hd.java
index a5d1144..15c1804 100644
--- a/nomanssave/hd.java
+++ b/nomanssave/hd.java
@@ -5,7 +5,7 @@
 
 class hd extends Handler {
    public void publish(LogRecord var1) {
-      Logger.AboutDialog(var1);
+      Logger.error(var1);
    }
 
    public void flush() {
diff --git a/nomanssave/hf.java b/nomanssave/hf.java
index 519166c..898f072 100644
--- a/nomanssave/hf.java
+++ b/nomanssave/hf.java
@@ -1,7 +1,7 @@
 package nomanssave;
 
 public class hf {
-   public static int AboutDialogCloseListener(String var0, int var1, int var2) {
+   public static int parseIntClamped(String var0, int var1, int var2) {
       var0 = var0.trim();
       if (var0.length() == 0) {
          throw new RuntimeException("No digits found");
@@ -29,7 +29,7 @@ public static int AboutDialogCloseListener(String var0, int var1, int var2) {
       }
    }
 
-   public static long AboutDialog(String var0, long var1, long var3) {
+   public static long parseLongClamped(String var0, long var1, long var3) {
       var0 = var0.trim();
       if (var0.length() == 0) {
          throw new RuntimeException("No digits found");
@@ -57,7 +57,7 @@ public static long AboutDialog(String var0, long var1, long var3) {
       }
    }
 
-   public static double AboutDialog(String var0, double var1, double var3) {
+   public static double parseDoubleClamped(String var0, double var1, double var3) {
       var0 = var0.trim();
       double var5 = Double.parseDouble(var0);
       if (var5 < var1) {
diff --git a/nomanssave/hj.java b/nomanssave/hj.java
index e7b3235..303f28b 100644
--- a/nomanssave/hj.java
+++ b/nomanssave/hj.java
@@ -19,7 +19,7 @@ public void run() {
       try {
          var1 = hi.j(this.sK);
       } catch (IOException var7) {
-         Logger.AboutDialog("Steam lookup error", var7);
+         Logger.error("Steam lookup error", var7);
          var1 = null;
       }
 
diff --git a/nomanssave/hk.java b/nomanssave/hk.java
index 38e5218..75a315d 100644
--- a/nomanssave/hk.java
+++ b/nomanssave/hk.java
@@ -95,7 +95,7 @@ public static int readInt(InputStream var0) {
       return (255 & var1[3]) << 24 | (255 & var1[2]) << 16 | (255 & var1[1]) << 8 | 255 & var1[0];
    }
 
-   public static void AboutDialog(OutputStream var0, int var1) {
+   public static void writeInt(OutputStream var0, int var1) {
       var0.write(255 & var1);
       var0.write(255 & var1 >> 8);
       var0.write(255 & var1 >> 16);
@@ -108,7 +108,7 @@ public static long f(InputStream var0) {
       return (255L & (long)var1[7]) << 56 | (255L & (long)var1[6]) << 48 | (255L & (long)var1[5]) << 40 | (255L & (long)var1[4]) << 32 | (255L & (long)var1[3]) << 24 | (255L & (long)var1[2]) << 16 | (255L & (long)var1[1]) << 8 | 255L & (long)var1[0];
    }
 
-   public static void AboutDialogCloseListener(OutputStream var0, long var1) {
+   public static void writeLong(OutputStream var0, long var1) {
       var0.write((int)(255L & var1));
       var0.write((int)(255L & var1 >> 8));
       var0.write((int)(255L & var1 >> 16));
diff --git a/nomanssave/hm.java b/nomanssave/hm.java
index 0df37fa..28cdb58 100644
--- a/nomanssave/hm.java
+++ b/nomanssave/hm.java
@@ -44,7 +44,7 @@ public int read(byte[] var1, int var2, int var3) {
    }
 
    // $FF: synthetic method
-   static InputStream AboutDialog(hm var0) {
+   static InputStream access$getInputStream(hm var0) {
       return var0.in;
    }
 }
diff --git a/nomanssave/hn.java b/nomanssave/hn.java
index b7ecb0d..28e13e9 100644
--- a/nomanssave/hn.java
+++ b/nomanssave/hn.java
@@ -17,7 +17,7 @@ public int read() {
       if (this.sc == 0) {
          return -1;
       } else {
-         int var1 = hm.AboutDialog(this.sW).read();
+         int var1 = hm.access$getInputStream(this.sW).read();
          if (var1 < 0) {
             throw new IOException("short read");
          } else {
@@ -39,7 +39,7 @@ public int read(byte[] var1, int var2, int var3) {
             var3 = this.sc;
          }
 
-         var3 = hm.AboutDialog(this.sW).read(var1, var2, var3);
+         var3 = hm.access$getInputStream(this.sW).read(var1, var2, var3);
          if (var3 <= 0) {
             throw new IOException("short read");
          } else {
diff --git a/nomanssave/i.java b/nomanssave/i.java
index 8d73076..d1acb53 100644
--- a/nomanssave/i.java
+++ b/nomanssave/i.java
@@ -14,9 +14,9 @@ class i implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      String var2 = h.AboutDialog(this.ShowErrorRunnable).getText();
-      h.AboutDialog(this.ShowErrorRunnable, ItemDefinition.AboutDialogCloseListener(h.AboutDialogCloseListener(this.ShowErrorRunnable), var2));
-      h.AccountPanel(this.ShowErrorRunnable);
+      String var2 = h.access$getTextField(this.ShowErrorRunnable).getText();
+      h.access$setSelectedItem(this.ShowErrorRunnable, ItemDefinition.findByAmmoType(h.access$getTypeFilter(this.ShowErrorRunnable), var2));
+      h.access$refreshCategoryFilter(this.ShowErrorRunnable);
       if (h.d(this.ShowErrorRunnable).size() == 0) {
          JOptionPane.showOptionDialog(this.ShowErrorRunnable, "Item not found.", "Warning", 0, 2, (Icon)null, new Object[]{"OK"}, (Object)null);
       }
diff --git a/nomanssave/j.java b/nomanssave/j.java
index e1639ea..9f30787 100644
--- a/nomanssave/j.java
+++ b/nomanssave/j.java
@@ -17,7 +17,7 @@ public int getSize() {
       return h.e(this.ShowErrorRunnable).size();
    }
 
-   public eB AboutDialogCloseListener(int var1) {
+   public eB getElementAt(int var1) {
       return (eB)h.e(this.ShowErrorRunnable).get(var1);
    }
 
@@ -38,6 +38,6 @@ public Object getSelectedItem() {
 
    // $FF: synthetic method
    public Object getElementAt(int var1) {
-      return this.AboutDialogCloseListener(var1);
+      return this.getElementAt(var1);
    }
 }
diff --git a/nomanssave/m.java b/nomanssave/m.java
index 2992bd7..2ce8556 100644
--- a/nomanssave/m.java
+++ b/nomanssave/m.java
@@ -12,7 +12,7 @@ class m implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      h.AboutDialog(this.ShowErrorRunnable, (ItemDefinition)h.j(this.ShowErrorRunnable).getSelectedItem());
+      h.access$setSelectedItem(this.ShowErrorRunnable, (ItemDefinition)h.j(this.ShowErrorRunnable).getSelectedItem());
       this.ShowErrorRunnable.setVisible(false);
    }
 }
diff --git a/nomanssave/p.java b/nomanssave/p.java
index 26cd251..48f97eb 100644
--- a/nomanssave/p.java
+++ b/nomanssave/p.java
@@ -66,7 +66,7 @@ private String[] d() {
       return this.ValidatedTextField == null ? new String[0] : (String[])this.ValidatedTextField.toArray(new String[0]);
    }
 
-   public static String[] AboutDialogCloseListener(Container var0) {
+   public static String[] show(Container var0) {
       if (H == null) {
          Frame var1 = JOptionPane.getFrameForComponent(var0);
          H = new p(var1);
@@ -77,7 +77,7 @@ public static String[] AboutDialogCloseListener(Container var0) {
       return H.d();
    }
 
-   public static String[] AccountPanel(Container var0) {
+   public static String[] showProducts(Container var0) {
       if (H == null) {
          Frame var1 = JOptionPane.getFrameForComponent(var0);
          H = new p(var1);
@@ -89,22 +89,22 @@ public static String[] AccountPanel(Container var0) {
    }
 
    // $FF: synthetic method
-   static List AboutDialog(p var0) {
+   static List access$getList(p var0) {
       return var0.rowList;
    }
 
    // $FF: synthetic method
-   static JTable AboutDialogCloseListener(p var0) {
+   static JTable access$getTable(p var0) {
       return var0.table;
    }
 
    // $FF: synthetic method
-   static void AboutDialog(p var0, List var1) {
+   static void access$setList(p var0, List var1) {
       var0.ValidatedTextField = var1;
    }
 
    // $FF: synthetic method
-   static List AccountPanel(p var0) {
+   static List access$getSelectedList(p var0) {
       return var0.ValidatedTextField;
    }
 }
diff --git a/nomanssave/q.java b/nomanssave/q.java
index 29bdaaf..2bb4895 100644
--- a/nomanssave/q.java
+++ b/nomanssave/q.java
@@ -39,19 +39,19 @@ public String getColumnName(int var1) {
    }
 
    public int getRowCount() {
-      return p.AboutDialog(this.BasesStoragePanel) == null ? 0 : p.AboutDialog(this.BasesStoragePanel).size();
+      return p.access$getList(this.BasesStoragePanel) == null ? 0 : p.access$getList(this.BasesStoragePanel).size();
    }
 
    public Object getValueAt(int var1, int var2) {
       switch(var2) {
       case 0:
-         return ((ItemDefinition)p.AboutDialog(this.BasesStoragePanel).get(var1)).N(3);
+         return ((ItemDefinition)p.access$getList(this.BasesStoragePanel).get(var1)).N(3);
       case 1:
-         return ((ItemDefinition)p.AboutDialog(this.BasesStoragePanel).get(var1)).getName();
+         return ((ItemDefinition)p.access$getList(this.BasesStoragePanel).get(var1)).getName();
       case 2:
-         return ((ItemDefinition)p.AboutDialog(this.BasesStoragePanel).get(var1)).bc().toString();
+         return ((ItemDefinition)p.access$getList(this.BasesStoragePanel).get(var1)).bc().toString();
       case 3:
-         return ((ItemDefinition)p.AboutDialog(this.BasesStoragePanel).get(var1)).getID();
+         return ((ItemDefinition)p.access$getList(this.BasesStoragePanel).get(var1)).getID();
       default:
          return null;
       }
diff --git a/nomanssave/r.java b/nomanssave/r.java
index 0c95d41..58a3d19 100644
--- a/nomanssave/r.java
+++ b/nomanssave/r.java
@@ -13,12 +13,12 @@ class r implements ActionListener {
    }
 
    public void actionPerformed(ActionEvent var1) {
-      int[] var2 = p.AboutDialogCloseListener(this.BasesStoragePanel).getSelectedRows();
-      p.AboutDialog(this.BasesStoragePanel, new ArrayList());
+      int[] var2 = p.show(this.BasesStoragePanel).getSelectedRows();
+      p.access$setList(this.BasesStoragePanel, new ArrayList());
 
       for(int var4 = 0; var4 < var2.length; ++var4) {
-         int var3 = p.AboutDialogCloseListener(this.BasesStoragePanel).convertRowIndexToModel(var2[var4]);
-         p.AccountPanel(this.BasesStoragePanel).add((String)p.AboutDialogCloseListener(this.BasesStoragePanel).getModel().getValueAt(var3, 3));
+         int var3 = p.show(this.BasesStoragePanel).convertRowIndexToModel(var2[var4]);
+         p.access$getSelectedList(this.BasesStoragePanel).add((String)p.show(this.BasesStoragePanel).getModel().getValueAt(var3, 3));
       }
 
       this.BasesStoragePanel.setVisible(false);
diff --git a/nomanssave/u.java b/nomanssave/u.java
index 1d87508..84e3228 100644
--- a/nomanssave/u.java
+++ b/nomanssave/u.java
@@ -8,17 +8,17 @@ class u implements SaveChangeListener {
       this.aZ = var1;
    }
 
-   public void AboutDialog(SaveLocation var1) {
-      if (Application.loadIcon(this.aZ) && Application.AboutDialogCloseListener(this.aZ) == var1) {
+   public void onSaveLocationChanged(SaveLocation var1) {
+      if (Application.loadIcon(this.aZ) && Application.access$getSaveLocation(this.aZ) == var1) {
          Application.AboutDialog(this.aZ, true);
       }
    }
 
-   public void AboutDialog(SaveLocation var1, int var2, String var3) {
-      if (Application.loadIcon(this.aZ) && Application.AboutDialogCloseListener(this.aZ) == var1) {
-         Application.AboutDialogCloseListener(this.aZ, true);
-         if (Application.AccountPanel(this.aZ) >= 0 && Application.d(this.aZ)[Application.AccountPanel(this.aZ)].getIndex() == var2) {
-            Application.AccountPanel(this.aZ, true);
+   public void onFileChanged(SaveLocation var1, int var2, String var3) {
+      if (Application.loadIcon(this.aZ) && Application.access$getSaveLocation(this.aZ) == var1) {
+         Application.access$setFileChanged(this.aZ, true);
+         if (Application.access$getSlotIndex(this.aZ) >= 0 && Application.d(this.aZ)[Application.access$getSlotIndex(this.aZ)].getIndex() == var2) {
+            Application.access$setAccountPanelChanged(this.aZ, true);
             if (Application.e(this.aZ) >= 0 && Application.f(this.aZ)[Application.e(this.aZ)].K().equals(var3)) {
                Application.d(this.aZ, true);
             }