aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsilid <simon@liddicott.com>2013-09-18 21:03:05 +0100
committersilid <simon@liddicott.com>2013-09-18 21:03:05 +0100
commit832df4f9999018edfee2d304553b1ed8b7b42bd7 (patch)
tree327f03700901f233272ba193d3a35951a587c6af
parent8bb3bbe2cfb1dd2b85c278f9da3cb2b80a2b5f5b (diff)
downloaddtv-scan-tables-832df4f9999018edfee2d304553b1ed8b7b42bd7.tar.gz
Removal of excess white space
-rw-r--r--dvb-t/uk-Aberdare14
-rw-r--r--dvb-t/uk-Angus14
-rw-r--r--dvb-t/uk-BeaconHill14
-rw-r--r--dvb-t/uk-Belmont14
-rw-r--r--dvb-t/uk-Bilsdale14
-rw-r--r--dvb-t/uk-BlackHill14
-rw-r--r--dvb-t/uk-Blaenplwyf14
-rw-r--r--dvb-t/uk-BluebellHill14
-rw-r--r--dvb-t/uk-Bressay14
-rw-r--r--dvb-t/uk-BrierleyHill14
-rw-r--r--dvb-t/uk-BristolIlchesterCrescent14
-rw-r--r--dvb-t/uk-BristolKingsWeston14
-rw-r--r--dvb-t/uk-Bromsgrove14
-rw-r--r--dvb-t/uk-BrougherMountain14
-rw-r--r--dvb-t/uk-Caldbeck14
-rw-r--r--dvb-t/uk-CaradonHill14
-rw-r--r--dvb-t/uk-Carmel14
-rw-r--r--dvb-t/uk-Chatton14
-rw-r--r--dvb-t/uk-Chesterfield14
-rw-r--r--dvb-t/uk-Craigkelly14
-rw-r--r--dvb-t/uk-CrystalPalace14
-rw-r--r--dvb-t/uk-Darvel14
-rw-r--r--dvb-t/uk-Divis14
-rw-r--r--dvb-t/uk-Dover14
-rw-r--r--dvb-t/uk-Durris14
-rw-r--r--dvb-t/uk-Eitshal14
-rw-r--r--dvb-t/uk-EmleyMoor14
-rw-r--r--dvb-t/uk-Fenham14
-rw-r--r--dvb-t/uk-Fenton14
-rw-r--r--dvb-t/uk-Ferryside10
-rw-r--r--dvb-t/uk-Guildford14
-rw-r--r--dvb-t/uk-Hannington14
-rw-r--r--dvb-t/uk-Hastings14
-rw-r--r--dvb-t/uk-Heathfield14
-rw-r--r--dvb-t/uk-HemelHempstead14
-rw-r--r--dvb-t/uk-HuntshawCross14
-rw-r--r--dvb-t/uk-Idle14
-rw-r--r--dvb-t/uk-KeelylangHill14
-rw-r--r--dvb-t/uk-Keighley14
-rw-r--r--dvb-t/uk-KilveyHill14
-rw-r--r--dvb-t/uk-KnockMore14
-rw-r--r--dvb-t/uk-Lancaster14
-rw-r--r--dvb-t/uk-LarkStoke14
-rw-r--r--dvb-t/uk-Limavady14
-rw-r--r--dvb-t/uk-Llanddona14
-rw-r--r--dvb-t/uk-Malvern14
-rw-r--r--dvb-t/uk-Mendip14
-rw-r--r--dvb-t/uk-Midhurst14
-rw-r--r--dvb-t/uk-MoelyParc14
-rw-r--r--dvb-t/uk-Nottingham14
-rw-r--r--dvb-t/uk-OliversMount14
-rw-r--r--dvb-t/uk-Oxford14
-rw-r--r--dvb-t/uk-PendleForest14
-rw-r--r--dvb-t/uk-Plympton14
-rw-r--r--dvb-t/uk-PontopPike14
-rw-r--r--dvb-t/uk-Pontypool14
-rw-r--r--dvb-t/uk-Preseli14
-rw-r--r--dvb-t/uk-Redruth14
-rw-r--r--dvb-t/uk-Reigate14
-rw-r--r--dvb-t/uk-RidgeHill14
-rw-r--r--dvb-t/uk-Rosemarkie14
-rw-r--r--dvb-t/uk-Rosneath14
-rw-r--r--dvb-t/uk-Rowridge14
-rw-r--r--dvb-t/uk-RumsterForest14
-rw-r--r--dvb-t/uk-Saddleworth14
-rw-r--r--dvb-t/uk-Salisbury14
-rw-r--r--dvb-t/uk-SandyHeath14
-rw-r--r--dvb-t/uk-Selkirk14
-rw-r--r--dvb-t/uk-Sheffield14
-rw-r--r--dvb-t/uk-StocklandHill14
-rw-r--r--dvb-t/uk-Storeton14
-rw-r--r--dvb-t/uk-Sudbury14
-rw-r--r--dvb-t/uk-SuttonColdfield14
-rw-r--r--dvb-t/uk-Tacolneston14
-rw-r--r--dvb-t/uk-TheWrekin14
-rw-r--r--dvb-t/uk-Torosay14
-rw-r--r--dvb-t/uk-TunbridgeWells14
-rw-r--r--dvb-t/uk-Waltham14
-rw-r--r--dvb-t/uk-Wenvoe14
-rw-r--r--dvb-t/uk-WhitehawkHill14
-rw-r--r--dvb-t/uk-WinterHill14
81 files changed, 565 insertions, 565 deletions
diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
index 6887696e..a43837c7 100644
--- a/dvb-t/uk-Aberdare
+++ b/dvb-t/uk-Aberdare
@@ -5,11 +5,11 @@
# location and provider: UK, Aberdare
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 521833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 530167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 521833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 530167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Angus b/dvb-t/uk-Angus
index 4207a776..57e3674c 100644
--- a/dvb-t/uk-Angus
+++ b/dvb-t/uk-Angus
@@ -5,11 +5,11 @@
# location and provider: UK, Angus
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-BeaconHill b/dvb-t/uk-BeaconHill
index 1b94f68b..41c4567b 100644
--- a/dvb-t/uk-BeaconHill
+++ b/dvb-t/uk-BeaconHill
@@ -5,11 +5,11 @@
# location and provider: UK, Beacon Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 762167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 762167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Belmont b/dvb-t/uk-Belmont
index cf2f4848..9ad122da 100644
--- a/dvb-t/uk-Belmont
+++ b/dvb-t/uk-Belmont
@@ -5,11 +5,11 @@
# location and provider: UK, Belmont
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 530000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 530000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Bilsdale b/dvb-t/uk-Bilsdale
index 335e0e04..7a313011 100644
--- a/dvb-t/uk-Bilsdale
+++ b/dvb-t/uk-Bilsdale
@@ -5,11 +5,11 @@
# location and provider: UK, Bilsdale
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 490000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 490000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-BlackHill b/dvb-t/uk-BlackHill
index a0749427..05876da8 100644
--- a/dvb-t/uk-BlackHill
+++ b/dvb-t/uk-BlackHill
@@ -5,11 +5,11 @@
# location and provider: UK, Black Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 626000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 626000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Blaenplwyf b/dvb-t/uk-Blaenplwyf
index 937488a7..ee67d716 100644
--- a/dvb-t/uk-Blaenplwyf
+++ b/dvb-t/uk-Blaenplwyf
@@ -5,11 +5,11 @@
# location and provider: UK, Blaenplwyf
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-BluebellHill b/dvb-t/uk-BluebellHill
index fed0a5fc..2f6c0d32 100644
--- a/dvb-t/uk-BluebellHill
+++ b/dvb-t/uk-BluebellHill
@@ -5,11 +5,11 @@
# location and provider: UK, Bluebell Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Bressay b/dvb-t/uk-Bressay
index c12f40eb..9628b869 100644
--- a/dvb-t/uk-Bressay
+++ b/dvb-t/uk-Bressay
@@ -5,11 +5,11 @@
# location and provider: UK, Bressay
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-BrierleyHill b/dvb-t/uk-BrierleyHill
index 261afe40..e856d971 100644
--- a/dvb-t/uk-BrierleyHill
+++ b/dvb-t/uk-BrierleyHill
@@ -5,11 +5,11 @@
# location and provider: UK, Brierley Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 762167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 762167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-BristolIlchesterCrescent b/dvb-t/uk-BristolIlchesterCrescent
index 753d815d..05aa3147 100644
--- a/dvb-t/uk-BristolIlchesterCrescent
+++ b/dvb-t/uk-BristolIlchesterCrescent
@@ -5,11 +5,11 @@
# location and provider: UK, Bristol Ilchester Crescent
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-BristolKingsWeston b/dvb-t/uk-BristolKingsWeston
index 955a9394..b2f56d2b 100644
--- a/dvb-t/uk-BristolKingsWeston
+++ b/dvb-t/uk-BristolKingsWeston
@@ -5,11 +5,11 @@
# location and provider: UK, Bristol Kings Weston
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 674000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 674000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Bromsgrove b/dvb-t/uk-Bromsgrove
index a1b98db6..eacd85c8 100644
--- a/dvb-t/uk-Bromsgrove
+++ b/dvb-t/uk-Bromsgrove
@@ -5,11 +5,11 @@
# location and provider: UK, Bromsgrove
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-BrougherMountain b/dvb-t/uk-BrougherMountain
index f6d486f6..1009153a 100644
--- a/dvb-t/uk-BrougherMountain
+++ b/dvb-t/uk-BrougherMountain
@@ -5,11 +5,11 @@
# location and provider: UK, Brougher Mountain
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 482167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 506000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 482167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 506000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Caldbeck b/dvb-t/uk-Caldbeck
index 9895c63c..4dceccc9 100644
--- a/dvb-t/uk-Caldbeck
+++ b/dvb-t/uk-Caldbeck
@@ -5,11 +5,11 @@
# location and provider: UK, Caldbeck
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 505833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 529833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 489833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 513833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 537833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 505833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 529833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 489833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 513833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 537833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-CaradonHill b/dvb-t/uk-CaradonHill
index 7534a80c..8c884cd6 100644
--- a/dvb-t/uk-CaradonHill
+++ b/dvb-t/uk-CaradonHill
@@ -5,11 +5,11 @@
# location and provider: UK, Caradon Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 497833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 521833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 530167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 497833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 521833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Carmel b/dvb-t/uk-Carmel
index 12338e2f..bcbb9458 100644
--- a/dvb-t/uk-Carmel
+++ b/dvb-t/uk-Carmel
@@ -5,11 +5,11 @@
# location and provider: UK, Carmel
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Chatton b/dvb-t/uk-Chatton
index aff98d0d..3ab285f1 100644
--- a/dvb-t/uk-Chatton
+++ b/dvb-t/uk-Chatton
@@ -5,11 +5,11 @@
# location and provider: UK, Chatton
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 618167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 618167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Chesterfield b/dvb-t/uk-Chesterfield
index 1da954f1..ad064e15 100644
--- a/dvb-t/uk-Chesterfield
+++ b/dvb-t/uk-Chesterfield
@@ -5,11 +5,11 @@
# location and provider: UK, Chesterfield
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Craigkelly b/dvb-t/uk-Craigkelly
index 84417b20..da71766d 100644
--- a/dvb-t/uk-Craigkelly
+++ b/dvb-t/uk-Craigkelly
@@ -5,11 +5,11 @@
# location and provider: UK, Craigkelly
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-CrystalPalace b/dvb-t/uk-CrystalPalace
index 9a61bf1f..962e7344 100644
--- a/dvb-t/uk-CrystalPalace
+++ b/dvb-t/uk-CrystalPalace
@@ -5,11 +5,11 @@
# location and provider: UK, Crystal Palace
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Darvel b/dvb-t/uk-Darvel
index b00ad96c..54952dc8 100644
--- a/dvb-t/uk-Darvel
+++ b/dvb-t/uk-Darvel
@@ -5,11 +5,11 @@
# location and provider: UK, Darvel
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 481833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 530000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 481833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 530000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Divis b/dvb-t/uk-Divis
index 0809af1c..c32bb475 100644
--- a/dvb-t/uk-Divis
+++ b/dvb-t/uk-Divis
@@ -5,11 +5,11 @@
# location and provider: UK, Divis
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 498000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 498000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Dover b/dvb-t/uk-Dover
index edee7d21..828f1d9b 100644
--- a/dvb-t/uk-Dover
+++ b/dvb-t/uk-Dover
@@ -5,11 +5,11 @@
# location and provider: UK, Dover
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Durris b/dvb-t/uk-Durris
index 6ffafab4..dcfd6fb6 100644
--- a/dvb-t/uk-Durris
+++ b/dvb-t/uk-Durris
@@ -5,11 +5,11 @@
# location and provider: UK, Durris
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Eitshal b/dvb-t/uk-Eitshal
index 204c8a54..7f697a9d 100644
--- a/dvb-t/uk-Eitshal
+++ b/dvb-t/uk-Eitshal
@@ -5,11 +5,11 @@
# location and provider: UK, Eitshal
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-EmleyMoor b/dvb-t/uk-EmleyMoor
index 477f19ed..9db71957 100644
--- a/dvb-t/uk-EmleyMoor
+++ b/dvb-t/uk-EmleyMoor
@@ -5,11 +5,11 @@
# location and provider: UK, Emley Moor
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 634000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 634000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Fenham b/dvb-t/uk-Fenham
index 06dd3c63..e4726b73 100644
--- a/dvb-t/uk-Fenham
+++ b/dvb-t/uk-Fenham
@@ -5,11 +5,11 @@
# location and provider: UK, Fenham
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Fenton b/dvb-t/uk-Fenton
index 769bc0a1..285e54b2 100644
--- a/dvb-t/uk-Fenton
+++ b/dvb-t/uk-Fenton
@@ -5,11 +5,11 @@
# location and provider: UK, Fenton
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Ferryside b/dvb-t/uk-Ferryside
index 8685476e..49ccc798 100644
--- a/dvb-t/uk-Ferryside
+++ b/dvb-t/uk-Ferryside
@@ -5,9 +5,9 @@
# location and provider: UK, Ferryside
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 545833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 498000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 545833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 498000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
diff --git a/dvb-t/uk-Guildford b/dvb-t/uk-Guildford
index 843e09cb..8b9a1652 100644
--- a/dvb-t/uk-Guildford
+++ b/dvb-t/uk-Guildford
@@ -5,11 +5,11 @@
# location and provider: UK, Guildford
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 626000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 626000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Hannington b/dvb-t/uk-Hannington
index 873f6182..b237bc5f 100644
--- a/dvb-t/uk-Hannington
+++ b/dvb-t/uk-Hannington
@@ -5,11 +5,11 @@
# location and provider: UK, Hannington
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 618167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 618167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Hastings b/dvb-t/uk-Hastings
index 8b0a38b2..23c510ec 100644
--- a/dvb-t/uk-Hastings
+++ b/dvb-t/uk-Hastings
@@ -5,11 +5,11 @@
# location and provider: UK, Hastings
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Heathfield b/dvb-t/uk-Heathfield
index 6cb8167c..00fa6ad1 100644
--- a/dvb-t/uk-Heathfield
+++ b/dvb-t/uk-Heathfield
@@ -5,11 +5,11 @@
# location and provider: UK, Heathfield
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-HemelHempstead b/dvb-t/uk-HemelHempstead
index 6e8996e5..a07dd76e 100644
--- a/dvb-t/uk-HemelHempstead
+++ b/dvb-t/uk-HemelHempstead
@@ -5,11 +5,11 @@
# location and provider: UK, Hemel Hempstead
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-HuntshawCross b/dvb-t/uk-HuntshawCross
index 22b0b30c..e6f2f1c6 100644
--- a/dvb-t/uk-HuntshawCross
+++ b/dvb-t/uk-HuntshawCross
@@ -5,11 +5,11 @@
# location and provider: UK, Huntshaw Cross
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 745833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 754167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 745833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 754167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Idle b/dvb-t/uk-Idle
index 6250620a..07dd0ef2 100644
--- a/dvb-t/uk-Idle
+++ b/dvb-t/uk-Idle
@@ -5,11 +5,11 @@
# location and provider: UK, Idle
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 522000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 522000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-KeelylangHill b/dvb-t/uk-KeelylangHill
index 6e929ee0..887c8f35 100644
--- a/dvb-t/uk-KeelylangHill
+++ b/dvb-t/uk-KeelylangHill
@@ -5,11 +5,11 @@
# location and provider: UK, Keelylang Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Keighley b/dvb-t/uk-Keighley
index a5493daf..90fcc47d 100644
--- a/dvb-t/uk-Keighley
+++ b/dvb-t/uk-Keighley
@@ -5,11 +5,11 @@
# location and provider: UK, Keighley
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 738000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 738000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-KilveyHill b/dvb-t/uk-KilveyHill
index 2c0983b7..81edd443 100644
--- a/dvb-t/uk-KilveyHill
+++ b/dvb-t/uk-KilveyHill
@@ -5,11 +5,11 @@
# location and provider: UK, Kilvey Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-KnockMore b/dvb-t/uk-KnockMore
index 1f99eee0..db361f8b 100644
--- a/dvb-t/uk-KnockMore
+++ b/dvb-t/uk-KnockMore
@@ -5,11 +5,11 @@
# location and provider: UK, Knockmore
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Lancaster b/dvb-t/uk-Lancaster
index 1e8ff6ff..7ffea259 100644
--- a/dvb-t/uk-Lancaster
+++ b/dvb-t/uk-Lancaster
@@ -5,11 +5,11 @@
# location and provider: UK, Lancaster
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 521833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 530167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 521833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 530167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-LarkStoke b/dvb-t/uk-LarkStoke
index 36773303..fd11f91f 100644
--- a/dvb-t/uk-LarkStoke
+++ b/dvb-t/uk-LarkStoke
@@ -5,11 +5,11 @@
# location and provider: UK, Lark Stoke
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Limavady b/dvb-t/uk-Limavady
index 91e9f248..8b7367eb 100644
--- a/dvb-t/uk-Limavady
+++ b/dvb-t/uk-Limavady
@@ -5,11 +5,11 @@
# location and provider: UK, Limavady
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 746000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 746000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Llanddona b/dvb-t/uk-Llanddona
index ee18e946..2f8ce2fa 100644
--- a/dvb-t/uk-Llanddona
+++ b/dvb-t/uk-Llanddona
@@ -5,11 +5,11 @@
# location and provider: UK, Llanddona
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Malvern b/dvb-t/uk-Malvern
index 9f5c2f1c..b222f5ac 100644
--- a/dvb-t/uk-Malvern
+++ b/dvb-t/uk-Malvern
@@ -5,11 +5,11 @@
# location and provider: UK, Malvern
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 785833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 785833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Mendip b/dvb-t/uk-Mendip
index 414009ee..74311204 100644
--- a/dvb-t/uk-Mendip
+++ b/dvb-t/uk-Mendip
@@ -5,11 +5,11 @@
# location and provider: UK, Mendip
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Midhurst b/dvb-t/uk-Midhurst
index cbca1c13..24cb05b4 100644
--- a/dvb-t/uk-Midhurst
+++ b/dvb-t/uk-Midhurst
@@ -5,11 +5,11 @@
# location and provider: UK, Midhurst
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-MoelyParc b/dvb-t/uk-MoelyParc
index fcb01632..83431bb0 100644
--- a/dvb-t/uk-MoelyParc
+++ b/dvb-t/uk-MoelyParc
@@ -5,11 +5,11 @@
# location and provider: UK, Moel y Parc
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 713833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 722167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 689833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 713833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 722167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 689833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Nottingham b/dvb-t/uk-Nottingham
index c9d6ee1f..408e2ecc 100644
--- a/dvb-t/uk-Nottingham
+++ b/dvb-t/uk-Nottingham
@@ -5,11 +5,11 @@
# location and provider: UK, Nottingham
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-OliversMount b/dvb-t/uk-OliversMount
index be5cc77b..47aa36c0 100644
--- a/dvb-t/uk-OliversMount
+++ b/dvb-t/uk-OliversMount
@@ -5,11 +5,11 @@
# location and provider: UK, Olivers Mount
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Oxford b/dvb-t/uk-Oxford
index f4f86514..af034081 100644
--- a/dvb-t/uk-Oxford
+++ b/dvb-t/uk-Oxford
@@ -5,11 +5,11 @@
# location and provider: UK, Oxford
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-PendleForest b/dvb-t/uk-PendleForest
index 4697ae44..6347f6e9 100644
--- a/dvb-t/uk-PendleForest
+++ b/dvb-t/uk-PendleForest
@@ -5,11 +5,11 @@
# location and provider: UK, Pendle Forest
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 521833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 497833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 530167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 521833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 497833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Plympton b/dvb-t/uk-Plympton
index 9684d201..e6709dd2 100644
--- a/dvb-t/uk-Plympton
+++ b/dvb-t/uk-Plympton
@@ -5,11 +5,11 @@
# location and provider: UK, Plympton
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-PontopPike b/dvb-t/uk-PontopPike
index 6a56ee22..53fa83e0 100644
--- a/dvb-t/uk-PontopPike
+++ b/dvb-t/uk-PontopPike
@@ -5,11 +5,11 @@
# location and provider: UK, Pontop Pike
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 698000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 698000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Pontypool b/dvb-t/uk-Pontypool
index c6b114d7..4eea4624 100644
--- a/dvb-t/uk-Pontypool
+++ b/dvb-t/uk-Pontypool
@@ -5,11 +5,11 @@
# location and provider: UK, Pontypool
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 538167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 505833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 481833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 538167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 505833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 481833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Preseli b/dvb-t/uk-Preseli
index 76ba4770..6fa6e347 100644
--- a/dvb-t/uk-Preseli
+++ b/dvb-t/uk-Preseli
@@ -5,11 +5,11 @@
# location and provider: UK, Preseli
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 650167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 674167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 641833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 665833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 650167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 674167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 641833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 665833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Redruth b/dvb-t/uk-Redruth
index a05849c5..641ed924 100644
--- a/dvb-t/uk-Redruth
+++ b/dvb-t/uk-Redruth
@@ -5,11 +5,11 @@
# location and provider: UK, Redruth
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 658167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 658167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Reigate b/dvb-t/uk-Reigate
index c706d945..6ec01ac9 100644
--- a/dvb-t/uk-Reigate
+++ b/dvb-t/uk-Reigate
@@ -5,11 +5,11 @@
# location and provider: UK, Reigate
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-RidgeHill b/dvb-t/uk-RidgeHill
index 5f31b41b..f347e8c5 100644
--- a/dvb-t/uk-RidgeHill
+++ b/dvb-t/uk-RidgeHill
@@ -5,11 +5,11 @@
# location and provider: UK, Ridge Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Rosemarkie b/dvb-t/uk-Rosemarkie
index 788e67ad..1baef05a 100644
--- a/dvb-t/uk-Rosemarkie
+++ b/dvb-t/uk-Rosemarkie
@@ -5,11 +5,11 @@
# location and provider: UK, Rosemarkie
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 626167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 626167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Rosneath b/dvb-t/uk-Rosneath
index 553f515e..e6b1c968 100644
--- a/dvb-t/uk-Rosneath
+++ b/dvb-t/uk-Rosneath
@@ -5,11 +5,11 @@
# location and provider: UK, Rosneath
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 738000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 738000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Rowridge b/dvb-t/uk-Rowridge
index 95795d62..25e3ee30 100644
--- a/dvb-t/uk-Rowridge
+++ b/dvb-t/uk-Rowridge
@@ -5,11 +5,11 @@
# location and provider: UK, Rowridge
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-RumsterForest b/dvb-t/uk-RumsterForest
index af7cfa06..62e3a032 100644
--- a/dvb-t/uk-RumsterForest
+++ b/dvb-t/uk-RumsterForest
@@ -5,11 +5,11 @@
# location and provider: UK, Rumster Forest
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Saddleworth b/dvb-t/uk-Saddleworth
index b4b9e7e0..f73ff5aa 100644
--- a/dvb-t/uk-Saddleworth
+++ b/dvb-t/uk-Saddleworth
@@ -5,11 +5,11 @@
# location and provider: UK, Saddleworth
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 713833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 722167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 689833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 713833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 722167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 689833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Salisbury b/dvb-t/uk-Salisbury
index 169748de..5b71c7a1 100644
--- a/dvb-t/uk-Salisbury
+++ b/dvb-t/uk-Salisbury
@@ -5,11 +5,11 @@
# location and provider: UK, Salisbury
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-SandyHeath b/dvb-t/uk-SandyHeath
index 28ff8da8..34977709 100644
--- a/dvb-t/uk-SandyHeath
+++ b/dvb-t/uk-SandyHeath
@@ -5,11 +5,11 @@
# location and provider: UK, Sandy Heath
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Selkirk b/dvb-t/uk-Selkirk
index b02d6097..35014a0a 100644
--- a/dvb-t/uk-Selkirk
+++ b/dvb-t/uk-Selkirk
@@ -5,11 +5,11 @@
# location and provider: UK, Selkirk
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 746000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 746000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Sheffield b/dvb-t/uk-Sheffield
index 815e6d53..36871aba 100644
--- a/dvb-t/uk-Sheffield
+++ b/dvb-t/uk-Sheffield
@@ -5,11 +5,11 @@
# location and provider: UK, Sheffield
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-StocklandHill b/dvb-t/uk-StocklandHill
index cd2c5887..7e362c38 100644
--- a/dvb-t/uk-StocklandHill
+++ b/dvb-t/uk-StocklandHill
@@ -5,11 +5,11 @@
# location and provider: UK, Stockland Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 538167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 505833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 481833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 538167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 505833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 481833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Storeton b/dvb-t/uk-Storeton
index c7abc2bb..c1be2bec 100644
--- a/dvb-t/uk-Storeton
+++ b/dvb-t/uk-Storeton
@@ -5,11 +5,11 @@
# location and provider: UK, Storeton
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Sudbury b/dvb-t/uk-Sudbury
index 44bf85f6..58ea4e76 100644
--- a/dvb-t/uk-Sudbury
+++ b/dvb-t/uk-Sudbury
@@ -5,11 +5,11 @@
# location and provider: UK, Sudbury
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-SuttonColdfield b/dvb-t/uk-SuttonColdfield
index 534b6fe7..fdf15007 100644
--- a/dvb-t/uk-SuttonColdfield
+++ b/dvb-t/uk-SuttonColdfield
@@ -5,11 +5,11 @@
# location and provider: UK, Sutton Coldfield
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Tacolneston b/dvb-t/uk-Tacolneston
index 2f4c82a4..2e33aa98 100644
--- a/dvb-t/uk-Tacolneston
+++ b/dvb-t/uk-Tacolneston
@@ -5,11 +5,11 @@
# location and provider: UK, Tacolneston
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 745833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 706000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 745833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 706000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-TheWrekin b/dvb-t/uk-TheWrekin
index 8da4d46a..a878a93b 100644
--- a/dvb-t/uk-TheWrekin
+++ b/dvb-t/uk-TheWrekin
@@ -5,11 +5,11 @@
# location and provider: UK, The Wrekin
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Torosay b/dvb-t/uk-Torosay
index 06438b61..bb678317 100644
--- a/dvb-t/uk-Torosay
+++ b/dvb-t/uk-Torosay
@@ -5,11 +5,11 @@
# location and provider: UK, Torosay
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-TunbridgeWells b/dvb-t/uk-TunbridgeWells
index 0aab00f5..82a0f8ac 100644
--- a/dvb-t/uk-TunbridgeWells
+++ b/dvb-t/uk-TunbridgeWells
@@ -5,11 +5,11 @@
# location and provider: UK, Tunbridge Wells
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Waltham b/dvb-t/uk-Waltham
index b66fcb68..b90bacf9 100644
--- a/dvb-t/uk-Waltham
+++ b/dvb-t/uk-Waltham
@@ -5,11 +5,11 @@
# location and provider: UK, Waltham
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 737833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 737833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Wenvoe b/dvb-t/uk-Wenvoe
index 31b673ce..913c1eb2 100644
--- a/dvb-t/uk-Wenvoe
+++ b/dvb-t/uk-Wenvoe
@@ -5,11 +5,11 @@
# location and provider: UK, Wenvoe
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 642167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 666167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 642167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 666167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-WhitehawkHill b/dvb-t/uk-WhitehawkHill
index 832101a1..de8627aa 100644
--- a/dvb-t/uk-WhitehawkHill
+++ b/dvb-t/uk-WhitehawkHill
@@ -5,11 +5,11 @@
# location and provider: UK, Whitehawk Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 714000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 714000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-WinterHill b/dvb-t/uk-WinterHill
index 8972e9bc..7e2d78ef 100644
--- a/dvb-t/uk-WinterHill
+++ b/dvb-t/uk-WinterHill
@@ -5,11 +5,11 @@
# location and provider: UK, Winter Hill
# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-T2 737833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
+T2 737833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # PSB3
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM4
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM5
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # COM6