diff --git a/targets/ar71xx-generic b/targets/ar71xx-generic
index 556b0ab0..7a5a8e69 100644
--- a/targets/ar71xx-generic
+++ b/targets/ar71xx-generic
@@ -1,9 +1,5 @@
-ATH10K_PACKAGES=
+ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
 ATH10K_PACKAGES_QCA9887=
-
-if [ "$GLUON_WLAN_MESH" = '11s' ]; then
-	ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
-fi
 if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then
 	ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca988x ath10k-firmware-qca988x-ct'
 	ATH10K_PACKAGES_QCA9887='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca9887 ath10k-firmware-qca9887-ct'
@@ -100,10 +96,10 @@ device netgear-wndrmacv2 wndrmacv2
 factory .img
 
 if [ "$BROKEN" ]; then
-device netgear-wndrmac wndrmac # BROKEN: untested
+device netgear-wndrmac wndrmac # BROKEN: Untested
 factory .img
 
-device netgear-wnr2200 wnr2200 WNR2200 # BROKEN: untested
+device netgear-wnr2200 wnr2200 WNR2200 # BROKEN: Untested
 factory .img
 fi
 
@@ -115,11 +111,9 @@ device onion-omega onion-omega
 
 # OpenMesh
 
-if [ "$ATH10K_PACKAGES" ]; then
 device openmesh-mr1750 mr1750 MR1750
 alias openmesh-mr1750v2
 packages $ATH10K_PACKAGES
-fi
 
 device openmesh-mr600 mr600 MR600
 alias openmesh-mr600v2
@@ -137,11 +131,9 @@ alias openmesh-om2p-lc
 device openmesh-om5p om5p OM5P
 alias openmesh-om5p-an
 
-if [ "$ATH10K_PACKAGES" ]; then
 device openmesh-om5p-ac om5pac OM5PAC
 alias openmesh-om5p-acv2
 packages $ATH10K_PACKAGES
-fi
 
 
 # TP-Link
@@ -161,7 +153,7 @@ device tp-link-tl-wr710n-v1 tl-wr710n-v1
 device tp-link-tl-wr710n-v2.1 tl-wr710n-v2.1
 
 if [ "$BROKEN" ]; then
-device tp-link-tl-wr810n tl-wr810n # untested
+device tp-link-tl-wr810n tl-wr810n # BROKEN: Untested
 fi
 
 device tp-link-tl-wr842n-nd-v1 tl-wr842n-v1
@@ -180,7 +172,6 @@ device tp-link-tl-wdr4300-v1 tl-wdr4300-v1
 
 device tp-link-tl-wr2543n-nd-v1 tl-wr2543-v1
 
-if [ "$ATH10K_PACKAGES" ]; then
 device tp-link-archer-c5-v1 archer-c5-v1
 packages $ATH10K_PACKAGES
 
@@ -192,25 +183,24 @@ device tp-link-archer-c7-v4 archer-c7-v4
 packages $ATH10K_PACKAGES
 
 if [ "$BROKEN" ]; then
-device tp-link-archer-c25-v1 archer-c25-v1 # instability with 5GHz mesh in some environments
+device tp-link-archer-c25-v1 archer-c25-v1 # BROKEN: OOM with 5GHz enabled in most environments
 packages $ATH10K_PACKAGES_QCA9887
 fi
 
 if [ "$BROKEN" ]; then
-device tp-link-archer-c58-v1 archer-c58-v1
+device tp-link-archer-c58-v1 archer-c58-v1 # BROKEN: OOM with 5GHz enabled in most environments
 fi
 
 if [ "$BROKEN" ] || [ "$GLUON_WLAN_MESH" = '11s' ]; then
-device tp-link-archer-c59-v1 archer-c59-v1 
+device tp-link-archer-c59-v1 archer-c59-v1 # BROKEN: IBSS meshing not working
 fi
 
 if [ "$BROKEN" ]; then
-device tp-link-archer-c60-v1 archer-c60-v1
+device tp-link-archer-c60-v1 archer-c60-v1 # BROKEN: OOM with 5GHz enabled in most environments
 fi
 
 device tp-link-re450 re450
 packages $ATH10K_PACKAGES
-fi
 
 
 # Ubiquiti
@@ -239,7 +229,7 @@ device ubiquiti-loco-m-xw ubnt-loco-m-xw
 alias ubiquiti-nanostation-loco-m2-xw
 alias ubiquiti-nanostation-loco-m5-xw
 if [ "$BROKEN" ]; then
-alias ubiquiti-nanobeam-m5 # untested
+alias ubiquiti-nanobeam-m5 # BROKEN: Untested
 fi
 
 device ubiquiti-nanostation-m-xw ubnt-nano-m-xw
@@ -266,7 +256,6 @@ if [ "$BROKEN" ]; then
 device ubiquiti-ls-sr71 ubnt-ls-sr71 # BROKEN: Untested
 fi
 
-if [ "$ATH10K_PACKAGES" ]; then
 device ubiquiti-unifi-ac-lite ubnt-unifiac-lite
 alias ubiquiti-unifi-ac-mesh
 packages $ATH10K_PACKAGES
@@ -275,7 +264,6 @@ factory
 device ubiquiti-unifi-ac-pro ubnt-unifiac-pro
 packages $ATH10K_PACKAGES
 factory
-fi
 
 
 # Western Digital
diff --git a/targets/ar71xx-tiny b/targets/ar71xx-tiny
index 5b56a34e..01027053 100644
--- a/targets/ar71xx-tiny
+++ b/targets/ar71xx-tiny
@@ -37,7 +37,7 @@ device tp-link-tl-wa801n-nd-v2 tl-wa801nd-v2
 device tp-link-tl-wa801n-nd-v3 tl-wa801nd-v3
 
 if [ "$BROKEN" ]; then
-device tp-link-tl-wr802n-v1 tl-wr802n-v1 # untested
+device tp-link-tl-wr802n-v1 tl-wr802n-v1 # BROKEN: Untested
 fi
 
 device tp-link-tl-wr841n-nd-v3 tl-wr841-v3
diff --git a/targets/ipq806x b/targets/ipq806x
index f4c0fc98..1cd1d0cc 100644
--- a/targets/ipq806x
+++ b/targets/ipq806x
@@ -1,8 +1,4 @@
-ATH10K_PACKAGES=
-
-if [ "$GLUON_WLAN_MESH" = '11s' ]; then
-	ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
-fi
+ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
 if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then
 	ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca99x0 ath10k-firmware-qca99x0-ct'
 fi
@@ -10,7 +6,5 @@ fi
 
 # TP-Link
 
-if [ "$ATH10K_PACKAGES" ]; then
 device tp-link-archer-c2600 C2600
 packages $ATH10K_PACKAGES
-fi
diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621
index e9171131..33d4e1b5 100644
--- a/targets/ramips-mt7621
+++ b/targets/ramips-mt7621
@@ -1,20 +1,20 @@
-# BROKEN: No AP+IBSS support, 11s has high packet loss
+# BROKEN: No AP+IBSS support (plus individual issues)
 if [ "$BROKEN" ]; then
 
 ## D-Link
 
-device d-link-dir-860l-b1 dir-860l-b1
+device d-link-dir-860l-b1 dir-860l-b1 # BROKEN: 2.4 GHz Mesh unreliable
 
 
 ## Netgear
 
-device netgear-wndr3700v5 wndr3700v5 # untested
+device netgear-wndr3700v5 wndr3700v5 # BROKEN: Untested
 factory
 
 
 ## ZBT
 
-device zbt-wg3526 zbt-wg3526
+device zbt-wg3526 zbt-wg3526 # BROKEN: Untested
 factory
 
 fi