diff --git a/home/AP_Mode/hostapd-WiFi7.conf b/home/AP_Mode/hostapd-WiFi7.conf
index 0655b43e..0f1cf667 100644
--- a/home/AP_Mode/hostapd-WiFi7.conf
+++ b/home/AP_Mode/hostapd-WiFi7.conf
@@ -21,6 +21,7 @@ wpa_passphrase=myPW1234
 # Band: a = 5GHz & 6GHz (a/n/ac/ax), g = 2Ghz (b/g/n)
 hw_mode=a
 # Channel availability varies by country
+# https://en.wikipedia.org/wiki/List_of_WLAN_channels
 # US:
 # 2.4 GHz (1-11)
 # 5 GHz ((36(42) and 149(155))
@@ -39,13 +40,14 @@ chanlist=37
 #   channels 15, 47, 79, 111, 143, 175, 207
 op_class=134
 # Country code
-country_code=CA
+# https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+country_code=US
 # All environments
 #country3=0x20
 # Outdoor
 #country3=0x4f
 # Indoor environment only
-country3=0x49
+#country3=0x49
 # Advertises the country_code and the set of allowed channels and transmit power levels
 ieee80211d=1
 # Enables support for 5GHz DFS channels if supported (requires ieee80211d=1)
@@ -104,7 +106,7 @@ tx_queue_data2_burst=2.0
 #preamble=1
 
 # Security
-# authentication algorithms (3 = both are allowed)
+# authentication algorithms (3 = both are allowed, use 3 for SAE)
 auth_algs=3
 # MAC address -based authentication (0 = accept unless in deny list)
 macaddr_acl=0
@@ -116,12 +118,13 @@ okc=1
 wpa=2
 # Pairwise cipher
 wpa_pairwise=CCMP CCMP-256
+rsn_pairwise=CCMP CCMP-256
 #
-# WPA3 Personal (required for WiFi 6e (6 GHz))
+# WPA3 Personal (required for WiFi 7 (6 GHz))
 wpa_key_mgmt=SAE
 ieee80211w=2
 
-# IEEE 802.11b (WiFi 4) configuration
+# IEEE 802.11n (WiFi 4) configuration
 ieee80211n=1
 wmm_enabled=1
 ht_coex=0
@@ -129,11 +132,11 @@ ht_coex=0
 # generic setting - 20 MHz channel width
 #ht_capab=[SHORT-GI-20]
 #
-# generic setting - 40 MHz channel width
+# generic setting - 40 MHz channel width (if allowed)
 #ht_capab=[HT40+][HT40-][SHORT-GI-20][SHORT-GI-40]
 #
-# mt7925  (HT capabilities: xxx)
-# work in progress ht_capab=[HT40-][LDPC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][MAX-AMSDU-7935]
+# mt7925  (HT capabilities 0x9ff)
+ht_capab=[LDPC][HT40+][HT40-][GF][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][MAX-AMSDU-7935]
 #
 
 # IEEE 802.11ac (WiFi 5) configuration
@@ -146,8 +149,8 @@ vht_oper_centr_freq_seg0_idx=39
 # generic setting
 #vht_capab=[SHORT-GI-80]
 #
-# mt7925 (VHT capabilities: xxx)
-# work in progress vht_capab=[RXLDPC][SHORT-GI-80][TX-STBC-2BY1][SU-BEAMFORMEE][MU-BEAMFORMEE][RX-ANTENNA-PATTERN][TX-ANTENNA-PATTERN][RX-STBC-1][BF-ANTENNA-4][MAX-MPDU-11454][MAX-A-MPDU-LEN-EXP7]
+# mt7925 (VHT capabilities: 0x339071f6
+vht_capab=[VHT160-80PLUS80][RXLDPC][SHORT-GI-80][SHORT-GI-160][TX-STBC-2BY1][SU-BEAMFORMEE][MU-BEAMFORMEE][RX-ANTENNA-PATTERN][TX-ANTENNA-PATTERN][RX-STBC-1][BF-ANTENNA-4][MAX-MPDU-11454][MAX-A-MPDU-LEN-EXP7]
 #
 
 # IEEE 802.11ax (WiFi 6) configuration