2 files changed, 47 insertions, 40 deletions

diff --git a/_ont_xgs/ont-hisense-ltf7267-bha+.md b/_ont_xgs/ont-hisense-ltf7267-bha+.md
index b57cf18..b3989f3 100644
--- a/_ont_xgs/ont-hisense-ltf7267-bha+.md
+++ b/_ont_xgs/ont-hisense-ltf7267-bha+.md
@@ -63,7 +63,7 @@ This ONT supports dual boot.
 
 `kernel0` and `rootfs0` respectively contain the kernel and firmware of the first image, `kernel1` and `rootfs1` the kernel and the firmware of the second one
 
-# General Settings and Useful Commands
+# XGS-PON ONU status
 
 To access Cortina Shell (needed to check OMCI stuff and XGSPON status) you can use the following command:
 
@@ -163,7 +163,7 @@ XGe Port idx 0 map to Port 6
 ```
 Please note that some of the above fields are decoded incorrectly, such as `sn` and `versionId`
 
-## Check OLT Vendor (from app-cli session)
+## Get information of the OLT vendor (from app-cli session)
 
 ```sh
 Cortina> enable
@@ -290,106 +290,112 @@ Link to PPTP eth: ------->instance 0x301
     |-----|------|-----|------|---------|---|-----|------|-----|------|
 ```
 
-## Changing the Hardware Version
+# GPON/OMCI settings
+
+## Setting ONU GPON Serial Number
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append line below to the file and save it to change HWVER
+Append lines below to the file and save it to change Serial Number
 
 ```
-CHAR-ARRAY      CFG_ID_GPON_VERSION = {0x46,0x35,0x36,0x38, 0x34,0x53,0x5f,0x76, 0x31,0x00,0x00,0x00, 0x00,0x00}; ##GPON version string, default value is V1.0
+STRING CFG_ID_PON_VENDOR_ID = SMBS;
+INT CFG_ID_PON_VSSN = 0xAABBCCDD;
 ```
 
 Reboot ONT to apply the change
 
-## Changing the Equipment ID
+
+## Setting ONU GPON LOID and LOID password
+
+{% include alert.html content="The value 0x0 is null, take note of your LoID and password from the original ONT" color="red" %}
+
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append the line below to the file and save it to change EQID
+Append lines below to the file and save it to change LoID and LoID password
 
 ```
-CHAR-ARRAY      CFG_ID_GPON_EQID = {0x46,0x49,0x42,0x45, 0x52,0x20,0x42,0x6f, 0x78,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00}; ##GPON ME ONU2G equiment id value, default is saturn
+CHAR-ARRAY      CFG_ID_LOID                                                         = {0x30,0x30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
+CHAR-ARRAY      CFG_ID_PASSWD                                                       = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
+```
+
+Reboot ONT to apply the change
+
+## Setting OMCI software version (ME 7)
+
+```sh
+# fw_setenv img_version0 20220527052622
+# fw_setenv img_version0 20220527052622
 ```
 
 Reboot ONT to apply the change
 
-## Changing Serial Number
+## Setting OMCI hardware version (ME 256)
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append lines below to the file and save it to change Serial Number
+Append line below to the file and save it to change HWVER
 
 ```
-STRING CFG_ID_PON_VENDOR_ID = SMBS;
-INT CFG_ID_PON_VSSN = 0xAABBCCDD;
+CHAR-ARRAY      CFG_ID_GPON_VERSION = {0x46,0x35,0x36,0x38, 0x34,0x53,0x5f,0x76, 0x31,0x00,0x00,0x00, 0x00,0x00}; ##GPON version string, default value is V1.0
 ```
 
 Reboot ONT to apply the change
 
-## Changing OLT Emulation Type
+## Setting OMCI equipment ID (ME 257)
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append lines below to the file and save it to change Serial Number
+Append the line below to the file and save it to change EQID
 
 ```
-STRING          CFG_ID_PON_OLT_TYPE                             = ALCL; ##GPON OLT Vendor name, support ZTE,ADTRAN,ALCL,CALIX,SUMITOMO,CORTINA,HUAWEI
+CHAR-ARRAY      CFG_ID_GPON_EQID = {0x46,0x49,0x42,0x45, 0x52,0x20,0x42,0x6f, 0x78,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00}; ##GPON ME ONU2G equiment id value, default is saturn
 ```
 
 Reboot ONT to apply the change
 
-## Changing OMCC Version
-
-{% include alert.html content="In Italy, if you are under some Huawei OLT it's mandatory to use 0xA3, while on Alcatel 0xB4, otherwise you will get O5 status but no MIBs - Note that this can be quirk of TIM Italy" alert="Warning" icon="svg-warning" color="red" %}
+# Advanced settings
 
+## Changing OLT Emulation Type
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append the line below to the file and save it to change Serial Number
+Append lines below to the file and save it to change Serial Number
 
 ```
-CHAR            CFG_ID_OMCC_VERSION                             = 0xB2;
+STRING          CFG_ID_PON_OLT_TYPE                             = ALCL; ##GPON OLT Vendor name, support ZTE,ADTRAN,ALCL,CALIX,SUMITOMO,CORTINA,HUAWEI
 ```
 
 Reboot ONT to apply the change
 
-## Changing LOID Username/Password
+## Changing OMCC Version
 
-{% include alert.html content="The value 0x0 is null, take note of your LoID and password from the original ONT" color="red" %}
+{% include alert.html content="In Italy, if you are under some Huawei OLT it's mandatory to use 0xA3, while on Alcatel 0xB4, otherwise you will get O5 status but no MIBs - Note that this can be quirk of TIM Italy" alert="Warning" icon="svg-warning" color="red" %}
 
 
 ```sh
 # vi /config/scfg.txt
 ```
 
-Append lines below to the file and save it to change LoID and LoID password
+Append the line below to the file and save it to change Serial Number
 
 ```
-CHAR-ARRAY      CFG_ID_LOID                                                         = {0x30,0x30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
-CHAR-ARRAY      CFG_ID_PASSWD                                                       = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
+CHAR            CFG_ID_OMCC_VERSION                             = 0xB2;
 ```
 
 Reboot ONT to apply the change
 
-## Spoofing firmware version
-
-```sh
-# fw_setenv img_version0 20220527052622
-# fw_setenv img_version0 20220527052622
-```
-
-Reboot ONT to apply the change
 
 # Known Bugs
 - `ALCL` OLT mode uses some static configurations on MIBs, so if your OLT has strict configuration checks it might not work properly
diff --git a/_ont_xgs/ont-huawei-useful-command.md b/_ont_xgs/ont-huawei-useful-command.md
index d664b16..4f0e91c 100644
--- a/_ont_xgs/ont-huawei-useful-command.md
+++ b/_ont_xgs/ont-huawei-useful-command.md
@@ -8,12 +8,11 @@ It is possible that this won't work/has been fixed in more recent versions.
 
 Now that this is done, the modified configuration file can be uploaded via the web interface, the ONT will restart and telnet should be accessible on port 23.
 
-
-# General Settings and Useful Commands
-
 {% include alert.html content="All results need to be converted from HEX to ASCII. You can use our [Converter](/ascii-hex), taking care to add 0x in front and remove the spaces every 8 hex digits." alert="Warning" icon="svg-info" color="blue" %}
 
-## Getting the OLT vendor
+# GPON ONU status
+
+## Get information of the OLT vendor
 
 ```
 WAP>omcicmd mib show meid 131 instid 0
@@ -31,7 +30,9 @@ success!
 ```
 *0x48575443* → *HWTC* (Huawei)
 
-## Getting the ONT SW Version 0 and 1
+# GPON/OMCI settings
+
+## Getting OMCI software version (ME 7)
 
 ```
 WAP>omcicmd mib show meid 7 instid 0
@@ -61,7 +62,7 @@ success!
 ```
 *0x56355230 32304331 30533131 3500* → *V5R020C10S115*
 
-## Getting the ONT Vendor ID and HW Version:
+## Getting OMCI hardware version and vendor ID (ME 256)
 
 ```
 WAP>omcicmd mib show meid 256 instid 0
@@ -90,7 +91,7 @@ success!
 *0x48575443* → *HWTC*
 *0x32343046 2e41* → *240F.A*
 
-## Getting the ONT Equipment ID
+## Getting OMCI equipment ID (ME 257)
 
 ```
 WAP>omcicmd mib show meid 257 instid 0