diff --git a/admin.proto b/admin.proto
index 89d6e5b..87cf0e6 100644
--- a/admin.proto
+++ b/admin.proto
@@ -42,7 +42,7 @@ message AdminMessage {
     /*
      * TODO: REPLACE
      */
-    WIFI_CONFIG = 3;
+    NETWORK_CONFIG = 3;
 
     /*
      * TODO: REPLACE
@@ -244,5 +244,10 @@ message AdminMessage {
      * Tell the node to factory reset, all device settings will be returned to factory defaults.
      */
     int32 factory_reset = 99;
+
+    /*
+     * Tell the node to reset the nodedb.
+     */
+    int32 nodedb_reset = 100;
   }
 }
diff --git a/config.options b/config.options
index 2ec4332..0290b2d 100644
--- a/config.options
+++ b/config.options
@@ -1,7 +1,7 @@
-*WiFiConfig.ssid max_size:33
-*WiFiConfig.psk max_size:64
+*NetworkConfig.wifi_ssid max_size:33
+*NetworkConfig.wifi_psk max_size:64
 
 # Max of three ignored nodes for our testing
 *LoRaConfig.ignore_incoming max_count:3
 
-*DeviceConfig.ntp_server max_size:33
\ No newline at end of file
+*NetworkConfig.ntp_server max_size:33
diff --git a/config.proto b/config.proto
index 01ca397..f9b8a51 100644
--- a/config.proto
+++ b/config.proto
@@ -47,9 +47,9 @@ message Config {
     Role role = 1;
 
     /*
-     * If set, this will disable the SerialConsole by not initilizing the StreamAPI
+     * Disabling this will disable the SerialConsole by not initilizing the StreamAPI
      */
-    bool serial_disabled = 2;
+    bool serial_enabled = 2;
 
     /*
      * By default we turn off logging as soon as an API client connects (to keep shared serial link quiet).
@@ -89,7 +89,7 @@ message Config {
       /*
        * Include geoidal separation
        */
-      GEOIDAL_SEPERATION   = 0x0004;
+      GEOIDAL_SEPARATION   = 0x0004;
     
       /*
        * Include the DOP value ; PDOP used by default, see below
@@ -138,9 +138,9 @@ message Config {
     uint32 position_broadcast_secs = 1;
 
     /*
-     * Disable adaptive position braoadcast, which is now the default.
+     * Adaptive position braoadcast, which is now the default.
      */
-    bool position_broadcast_smart_disabled = 2;
+    bool position_broadcast_smart_enabled = 2;
 
     /*
      * If set, this node is at a fixed position.
@@ -150,9 +150,9 @@ message Config {
     bool fixed_position = 3;
 
     /*
-     * Should the GPS be disabled for this node?
+     * Is GPS enabled for this node?
      */
-    bool gps_disabled = 4;
+    bool gps_enabled = 4;
 
     /*
      * How often should we try to get GPS position (in seconds)
@@ -341,6 +341,22 @@ message Config {
       OSGR = 5;
     }
 
+    /*
+     * Unit display preference
+     */
+    enum DisplayUnits {
+
+      /*
+       * Metric (Default)
+       */
+      METRIC = 0;
+
+      /*
+       * Imperial
+       */
+      IMPERIAL = 1;
+    }
+
     /*
      * Number of seconds the screen stays on after pressing the user button or receiving a message
      * 0 for default of one minute MAXUINT for always on
@@ -363,6 +379,16 @@ message Config {
      * (top of display is heading direction) is used.
      */
     bool compass_north_top = 4;
+
+    /*
+     * Flip screen vertically, for cases that mount the screen upside down
+     */
+    bool flip_screen = 5;
+
+    /*
+     * Perferred display units
+     */
+    DisplayUnits units = 6;
   }
 
   /*
@@ -481,12 +507,10 @@ message Config {
     }
 
     /*
-     * If zero then, use default max legal continuous power (ie. something that won't
-     * burn out the radio hardware)
-     * In most cases you should use zero here.
-     * Units are in dBm.
-    */
-    int32 tx_power = 1;
+     * When enabled, the `modem_preset` fields will be adheared to, else the `bandwidth`/`spread_factor`/`coding_rate`
+     * will be taked from their respective manually defined fields
+     */
+    bool use_preset = 1;
 
     /*
      * Either modem_config or bandwidth/spreading/coding will be specified - NOT BOTH.
@@ -538,7 +562,15 @@ message Config {
      * Disable TX from the LoRa radio. Useful for hot-swapping antennas and other tests.
      * Defaults to false
      */
-    bool tx_disabled = 9;
+    bool tx_enabled = 9;
+
+    /*
+     * If zero then, use default max legal continuous power (ie. something that won't
+     * burn out the radio hardware)
+     * In most cases you should use zero here.
+     * Units are in dBm.
+    */
+    int32 tx_power = 10;
 
     /*
      * For testing it is useful sometimes to force a node to never listen to
diff --git a/mesh.proto b/mesh.proto
index 7cbd407..23a5879 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -126,7 +126,7 @@ message Position {
   /*
    * Geoidal separation in meters
    */
-  sint32 altitude_geoidal_seperation = 10;
+  sint32 altitude_geoidal_separation = 10;
 
   /*
    * Horizontal, Vertical and Position Dilution of Precision, in 1/100 units
diff --git a/module_config.proto b/module_config.proto
index 264916e..9a54122 100644
--- a/module_config.proto
+++ b/module_config.proto
@@ -18,7 +18,6 @@ message ModuleConfig {
     /*
      * If a meshtastic node is able to reach the internet it will normally attempt to gateway any channels that are marked as
      * is_uplink_enabled or is_downlink_enabled.
-     * But if this flag is set, all MQTT features will be disabled and no servers will be contacted.
     */
     bool enabled = 1;
 
diff --git a/telemetry.proto b/telemetry.proto
index 72f1a9d..0842467 100644
--- a/telemetry.proto
+++ b/telemetry.proto
@@ -130,4 +130,14 @@ enum TelemetrySensorType {
   * High accuracy temperature and pressure
   */
   BMP280 = 6;
+
+  /*
+  * High accuracy temperature and humidity
+  */
+  SHTC3 = 7;
+  
+  /*
+  * High accuracy pressure
+  */
+  LPS22 = 8;
 };