85 files changed, 1253 insertions, 905 deletions

diff --git a/dvb-t/cz-All b/dvb-t/cz-All
index 29875b1..c01c0a1 100644
--- a/dvb-t/cz-All
+++ b/dvb-t/cz-All
@@ -1,52 +1,44 @@
-# Czech Republic, whole country
-# Created from http://www.digizone.cz/texty/mapy-pokryti-multiplex-1-ceska-televize/
-# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-2-radiokomunikace/
-# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-3-czech-digital-group/
-# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-4-telefonica-o2/
-# and http://www.digitalnitelevize.cz/informace/dvb-t/vysilaci-sit-1.html
-# and http://www.digitalnitelevize.cz/informace/dvb-t/vysilaci-sit-2.html
+# Czech Republic, whole country (updated to regulatory 2013)
+# Created from http://www.ctu.cz/cs/download/plan-vyuziti-radioveho-spektra/rok_2012/pv-p_10-08_2012-11.pdf
+
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# multiplexes 1+2
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-20 07:44:40 +0000
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-# multiplex 3
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# multiplex 4
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
index 1676d8d..a43837c 100644
--- a/dvb-t/uk-Aberdare
+++ b/dvb-t/uk-Aberdare
@@ -1,15 +1,15 @@
-# UK, Aberdare
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 474167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 530167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-
-
-#C21+	C22+	C24-	C25+	C27-	C28+
-
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 250295d..57e3674 100644
--- a/dvb-t/uk-Angus
+++ b/dvb-t/uk-Angus
@@ -1,10 +1,15 @@
-# UK, Angus
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 825833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 8d1577d..41c4567 100644
--- a/dvb-t/uk-BeaconHill
+++ b/dvb-t/uk-BeaconHill
@@ -1,10 +1,15 @@
-# UK, Beacon Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 721833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 770167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 738167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 fee76db..9ad122d 100644
--- a/dvb-t/uk-Belmont
+++ b/dvb-t/uk-Belmont
@@ -1,10 +1,15 @@
-# UK, Belmont
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 d05c95f..7a31301 100644
--- a/dvb-t/uk-Bilsdale
+++ b/dvb-t/uk-Bilsdale
@@ -1,10 +1,15 @@
-# UK, Bilsdale
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 ac8c2c1..05876da 100644
--- a/dvb-t/uk-BlackHill
+++ b/dvb-t/uk-BlackHill
@@ -1,10 +1,15 @@
-# UK, Black Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 35dbade..ee67d71 100644
--- a/dvb-t/uk-Blaenplwyf
+++ b/dvb-t/uk-Blaenplwyf
@@ -1,10 +1,15 @@
-# UK, Blaenplwyf
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 096d08b..2f6c0d3 100644
--- a/dvb-t/uk-BluebellHill
+++ b/dvb-t/uk-BluebellHill
@@ -1,10 +1,15 @@
-# UK, Bluebell Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 665833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 c77bfb0..9628b86 100644
--- a/dvb-t/uk-Bressay
+++ b/dvb-t/uk-Bressay
@@ -1,10 +1,15 @@
-# UK, Bressay
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 20b3247..e856d97 100644
--- a/dvb-t/uk-BrierleyHill
+++ b/dvb-t/uk-BrierleyHill
@@ -1,10 +1,15 @@
-# UK, Brierley Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 825833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 753833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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-BristolIlchesterCres b/dvb-t/uk-BristolIlchesterCres
deleted file mode 100644
index c84c224..0000000
--- a/dvb-t/uk-BristolIlchesterCres
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Bristol Ilchester Cres.
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BristolIlchesterCrescent b/dvb-t/uk-BristolIlchesterCrescent
new file mode 100644
index 0000000..05aa314
--- /dev/null
+++ b/dvb-t/uk-BristolIlchesterCrescent
@@ -0,0 +1,15 @@
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 e3425ee..b2f56d2 100644
--- a/dvb-t/uk-BristolKingsWeston
+++ b/dvb-t/uk-BristolKingsWeston
@@ -1,10 +1,15 @@
-# UK, Bristol King's Weston
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 506000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 efca587..eacd85c 100644
--- a/dvb-t/uk-Bromsgrove
+++ b/dvb-t/uk-Bromsgrove
@@ -1,10 +1,15 @@
-# UK, Bromsgrove
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 537833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 569833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 489833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 d8ad238..1009153 100644
--- a/dvb-t/uk-BrougherMountain
+++ b/dvb-t/uk-BrougherMountain
@@ -1,10 +1,15 @@
-# UK, Brougher Mountain
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 490167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 514167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 75f2952..4dceccc 100644
--- a/dvb-t/uk-Caldbeck
+++ b/dvb-t/uk-Caldbeck
@@ -1,10 +1,15 @@
-# UK, Caldbeck
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 514167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 90f6eef..8c884cd 100644
--- a/dvb-t/uk-CaradonHill
+++ b/dvb-t/uk-CaradonHill
@@ -1,10 +1,15 @@
-# UK, Caradon Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 553833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 497833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 32372c5..bcbb945 100644
--- a/dvb-t/uk-Carmel
+++ b/dvb-t/uk-Carmel
@@ -1,10 +1,15 @@
-# UK, Carmel
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 825833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 fe42d13..3ab285f 100644
--- a/dvb-t/uk-Chatton
+++ b/dvb-t/uk-Chatton
@@ -1,10 +1,15 @@
-# UK, Chatton
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 ae6b88f..ad064e1 100644
--- a/dvb-t/uk-Chesterfield
+++ b/dvb-t/uk-Chesterfield
@@ -1,10 +1,15 @@
-# UK, Chesterfield
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 626000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 650000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 674000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 63bb5d4..da71766 100644
--- a/dvb-t/uk-Craigkelly
+++ b/dvb-t/uk-Craigkelly
@@ -1,10 +1,15 @@
-# UK, Craigkelly
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 489833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 9251b81..962e734 100644
--- a/dvb-t/uk-CrystalPalace
+++ b/dvb-t/uk-CrystalPalace
@@ -1,17 +1,15 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20120112 1 0 TERRESTRIAL GB </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: Crystal Palace, UK
-# date (yyyy-mm-dd)    : 2012-02-12
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Crystal Palace
+# date (yyyy-mm-dd)    : 2013-09-18
 #
-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#------------------------------------------------------------------------------
-T 481833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
-T 537833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
-T 505833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
-T 561833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
-T 529833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
-T 578166670 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
-T2 0 16435 554000000 8MHz AUTO AUTO     AUTO AUTO AUTO AUTO    # London.
+# 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
diff --git a/dvb-t/uk-Darvel b/dvb-t/uk-Darvel
index 4fa6382..54952dc 100644
--- a/dvb-t/uk-Darvel
+++ b/dvb-t/uk-Darvel
@@ -1,10 +1,15 @@
-# UK, Darvel
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 481833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 505833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 561833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 3836375..c32bb47 100644
--- a/dvb-t/uk-Divis
+++ b/dvb-t/uk-Divis
@@ -1,10 +1,15 @@
-# UK, Divis
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 569833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 489833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 137b49f..828f1d9 100644
--- a/dvb-t/uk-Dover
+++ b/dvb-t/uk-Dover
@@ -1,14 +1,15 @@
-# UK, Dover
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 745833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, Dover B
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 851f0f3..dcfd6fb 100644
--- a/dvb-t/uk-Durris
+++ b/dvb-t/uk-Durris
@@ -1,10 +1,15 @@
-# UK, Durris
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 722167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 634000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 0992656..7f697a9 100644
--- a/dvb-t/uk-Eitshal
+++ b/dvb-t/uk-Eitshal
@@ -1,10 +1,15 @@
-# UK, Eitshal
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 561833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 af57649..9db7195 100644
--- a/dvb-t/uk-EmleyMoor
+++ b/dvb-t/uk-EmleyMoor
@@ -1,7 +1,15 @@
-# UK, Emley Moor
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # PSB1/BBCA
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # PSB2/D3&4
-T 714000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # COM4/SDN
-T 722000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # COM5/ARQA
-T 690000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # COM6/ARQB
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 f9f3da5..e4726b7 100644
--- a/dvb-t/uk-Fenham
+++ b/dvb-t/uk-Fenham
@@ -1,10 +1,15 @@
-# UK, Fenham
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 78c7819..285e54b 100644
--- a/dvb-t/uk-Fenton
+++ b/dvb-t/uk-Fenton
@@ -1,10 +1,15 @@
-# UK, Fenton
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 577833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 2031564..49ccc79 100644
--- a/dvb-t/uk-Ferryside
+++ b/dvb-t/uk-Ferryside
@@ -1,8 +1,13 @@
-# UK, Ferryside
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 a5350a0..8b9a165 100644
--- a/dvb-t/uk-Guildford
+++ b/dvb-t/uk-Guildford
@@ -1,10 +1,15 @@
-# UK, Guildford
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 30a261a..b237bc5 100644
--- a/dvb-t/uk-Hannington
+++ b/dvb-t/uk-Hannington
@@ -1,10 +1,15 @@
-# UK, Hannington
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 626167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 f5f7b71..23c510e 100644
--- a/dvb-t/uk-Hastings
+++ b/dvb-t/uk-Hastings
@@ -1,10 +1,15 @@
-# UK, Hastings
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 497833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 b65db77..00fa6ad 100644
--- a/dvb-t/uk-Heathfield
+++ b/dvb-t/uk-Heathfield
@@ -1,10 +1,15 @@
-# UK, Heathfield
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 689833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 681833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 87fbe86..a07dd76 100644
--- a/dvb-t/uk-HemelHempstead
+++ b/dvb-t/uk-HemelHempstead
@@ -1,10 +1,15 @@
-# UK, Hemel Hempstead
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 802000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 9572b29..e6f2f1c 100644
--- a/dvb-t/uk-HuntshawCross
+++ b/dvb-t/uk-HuntshawCross
@@ -1,13 +1,15 @@
-# UK, Huntshaw Cross
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 737833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 769833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 793833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 817833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 761833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, Huntshaw Cross B
-T 714000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 84fdc29..07dd0ef 100644
--- a/dvb-t/uk-Idle
+++ b/dvb-t/uk-Idle
@@ -1,10 +1,15 @@
-# UK, Idle
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 754000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 3b17375..887c8f3 100644
--- a/dvb-t/uk-KeelylangHill
+++ b/dvb-t/uk-KeelylangHill
@@ -1,10 +1,15 @@
-# UK, Keelylang Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 722167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 7db30f4..90fcc47 100644
--- a/dvb-t/uk-Keighley
+++ b/dvb-t/uk-Keighley
@@ -1,10 +1,15 @@
-# UK, Keighley
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 834000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 a091be6..81edd44 100644
--- a/dvb-t/uk-KilveyHill
+++ b/dvb-t/uk-KilveyHill
@@ -1,10 +1,15 @@
-# UK, Kilvey Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 529833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 561833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 f6ecb3c..db361f8 100644
--- a/dvb-t/uk-KnockMore
+++ b/dvb-t/uk-KnockMore
@@ -1,10 +1,15 @@
-# UK, Knock More
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 69b6129..7ffea25 100644
--- a/dvb-t/uk-Lancaster
+++ b/dvb-t/uk-Lancaster
@@ -1,10 +1,15 @@
-# UK, Lancaster
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 a7b7a39..fd11f91 100644
--- a/dvb-t/uk-LarkStoke
+++ b/dvb-t/uk-LarkStoke
@@ -1,10 +1,15 @@
-# UK, Lark Stoke
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 327d318..8b7367e 100644
--- a/dvb-t/uk-Limavady
+++ b/dvb-t/uk-Limavady
@@ -1,10 +1,15 @@
-# UK, Limavady
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 769833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 761833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 810167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 123c6be..2f8ce2f 100644
--- a/dvb-t/uk-Llanddona
+++ b/dvb-t/uk-Llanddona
@@ -1,10 +1,15 @@
-# UK, Llanddona
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 770167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 674000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 da02f7b..b222f5a 100644
--- a/dvb-t/uk-Malvern
+++ b/dvb-t/uk-Malvern
@@ -1,10 +1,15 @@
-# UK, Malvern
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 682000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 658000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 634000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 966d01f..7431120 100644
--- a/dvb-t/uk-Mendip
+++ b/dvb-t/uk-Mendip
@@ -1,10 +1,15 @@
-# UK, Mendip
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 802167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 826167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 c1a5ceb..24cb05b 100644
--- a/dvb-t/uk-Midhurst
+++ b/dvb-t/uk-Midhurst
@@ -1,10 +1,15 @@
-# UK, Midhurst
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 802167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 778167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 817833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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-Moel-y-Parc b/dvb-t/uk-Moel-y-Parc
deleted file mode 100644
index 94e4997..0000000
--- a/dvb-t/uk-Moel-y-Parc
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Moel-y-Parc
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 770000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 794000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 818000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-MoelyParc b/dvb-t/uk-MoelyParc
new file mode 100644
index 0000000..83431bb
--- /dev/null
+++ b/dvb-t/uk-MoelyParc
@@ -0,0 +1,15 @@
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 e94f1c4..408e2ec 100644
--- a/dvb-t/uk-Nottingham
+++ b/dvb-t/uk-Nottingham
@@ -1,10 +1,15 @@
-# UK, Nottingham
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 842000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 1ad0017..47aa36c 100644
--- a/dvb-t/uk-OliversMount
+++ b/dvb-t/uk-OliversMount
@@ -1,10 +1,15 @@
-# UK, Oliver's Mount
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 842167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 738167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 c179988..af03408 100644
--- a/dvb-t/uk-Oxford
+++ b/dvb-t/uk-Oxford
@@ -1,26 +1,15 @@
-# UK, Oxford
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Oxford
+# date (yyyy-mm-dd)    : 2013-09-18
 #
-# Post-Switchover, found from a mixture of w_scan, trial+error
-# and http://www.ukfree.tv/txdetail.php?a=SP567105
-
-# Local Channels, C51, details still TBA
-T 713833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-
-# PSB1 BBC-A, C53+. Apparently 730.2 but actually looks to be 730.167
-T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# ArqB (COM6), C55, 746.0
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# PSB3 BBC-B, C57, 256QAM DVB-T2, TBA
-# May well be wrong, needs a DVB-T2 tuner to be sure!
-T 762000000 8MHz 2/3 NONE QAM256 8k 1/32 NONE
-
-# ArqA (COM5), C59-, Apparently 777.8 but actually looks to be 777.833
-T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# PSB2, D3+4, C60-, Apparently 785.0 but actually looks to be 785.833
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# SDN (COM4), C62, 802.0
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 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
diff --git a/dvb-t/uk-PendleForest b/dvb-t/uk-PendleForest
index 70d21cc..6347f6e 100644
--- a/dvb-t/uk-PendleForest
+++ b/dvb-t/uk-PendleForest
@@ -1,10 +1,15 @@
-# UK, Pendle Forest
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 c8c30a8..e6709dd 100644
--- a/dvb-t/uk-Plympton
+++ b/dvb-t/uk-Plympton
@@ -1,10 +1,15 @@
-# UK, Plympton
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 842167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 833833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 809833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 754000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 af1f6a5..53fa83e 100644
--- a/dvb-t/uk-PontopPike
+++ b/dvb-t/uk-PontopPike
@@ -1,10 +1,15 @@
-# UK, Pontop Pike
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 778167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 802167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 c258ce8..4eea462 100644
--- a/dvb-t/uk-Pontypool
+++ b/dvb-t/uk-Pontypool
@@ -1,10 +1,15 @@
-# UK, Pontypool
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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
new file mode 100644
index 0000000..6fa6e34
--- /dev/null
+++ b/dvb-t/uk-Preseli
@@ -0,0 +1,15 @@
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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-Presely b/dvb-t/uk-Presely
deleted file mode 100644
index bdfe4f1..0000000
--- a/dvb-t/uk-Presely
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Presely
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 665833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Redruth b/dvb-t/uk-Redruth
index 8f15fa0..641ed92 100644
--- a/dvb-t/uk-Redruth
+++ b/dvb-t/uk-Redruth
@@ -1,13 +1,15 @@
-# UK, Redruth
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 650167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 dd40fbf..6ec01ac 100644
--- a/dvb-t/uk-Reigate
+++ b/dvb-t/uk-Reigate
@@ -1,10 +1,15 @@
-# UK, Reigate
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 40e13f4..f347e8c 100644
--- a/dvb-t/uk-RidgeHill
+++ b/dvb-t/uk-RidgeHill
@@ -1,10 +1,15 @@
-# UK, Ridge Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 36df581..1baef05 100644
--- a/dvb-t/uk-Rosemarkie
+++ b/dvb-t/uk-Rosemarkie
@@ -1,10 +1,15 @@
-# UK, Rosemarkie
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 633833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 657833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 facbd5c..e6b1c96 100644
--- a/dvb-t/uk-Rosneath
+++ b/dvb-t/uk-Rosneath
@@ -1,10 +1,15 @@
-# UK, Rosneath
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 729833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 761833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 809833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 078d7a1..25e3ee3 100644
--- a/dvb-t/uk-Rowridge
+++ b/dvb-t/uk-Rowridge
@@ -1,10 +1,15 @@
-# UK, Rowridge
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 489833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 87941b3..62e3a03 100644
--- a/dvb-t/uk-RumsterForest
+++ b/dvb-t/uk-RumsterForest
@@ -1,10 +1,15 @@
-# UK, Rumster Forest
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 802000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 dbd037c..f73ff5a 100644
--- a/dvb-t/uk-Saddleworth
+++ b/dvb-t/uk-Saddleworth
@@ -1,10 +1,15 @@
-# UK, Saddleworth
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 633833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 657833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 87b1c1d..5b71c7a 100644
--- a/dvb-t/uk-Salisbury
+++ b/dvb-t/uk-Salisbury
@@ -1,10 +1,15 @@
-# UK, Salisbury
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 745833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 753833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 721833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 8c6cf74..3497770 100644
--- a/dvb-t/uk-SandyHeath
+++ b/dvb-t/uk-SandyHeath
@@ -1,10 +1,15 @@
-# UK, Sandy Heath
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 665833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 626167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 88f5f84..35014a0 100644
--- a/dvb-t/uk-Selkirk
+++ b/dvb-t/uk-Selkirk
@@ -1,10 +1,15 @@
-# UK, Selkirk
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 810167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 2469611..36871ab 100644
--- a/dvb-t/uk-Sheffield
+++ b/dvb-t/uk-Sheffield
@@ -1,10 +1,15 @@
-# UK, Sheffield
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 762000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 f89a86d..7e362c3 100644
--- a/dvb-t/uk-StocklandHill
+++ b/dvb-t/uk-StocklandHill
@@ -1,9 +1,15 @@
-# UK, Stockland Hill
-# http://www.ukfree.tv/txdetail.php?a=ST222014
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB1
-T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB2
-#T 538167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB3 (DVB-T2)
-T 505833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM4
-T 481833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM5
-T 529833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM6
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 8580aaa..c1be2be 100644
--- a/dvb-t/uk-Storeton
+++ b/dvb-t/uk-Storeton
@@ -1,13 +1,15 @@
-# UK, Storeton
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 15e5e23..58ea4e7 100644
--- a/dvb-t/uk-Sudbury
+++ b/dvb-t/uk-Sudbury
@@ -1,12 +1,15 @@
-# UK, Sudbury
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 690167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, Sudbury B
-T 754000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 67cf07f..fdf1500 100644
--- a/dvb-t/uk-SuttonColdfield
+++ b/dvb-t/uk-SuttonColdfield
@@ -1,10 +1,15 @@
-# UK, Sutton Coldfield
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 682167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 3d0ee06..2e33aa9 100644
--- a/dvb-t/uk-Tacolneston
+++ b/dvb-t/uk-Tacolneston
@@ -1,16 +1,15 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20120128 1 0 TERRESTRIAL GB </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: Tacolneston UK
-# date (yyyy-mm-dd)    : 2012-03-10
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Tacolneston
+# date (yyyy-mm-dd)    : 2013-09-18
 #
-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#------------------------------------------------------------------------------
-T 642000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE      # East Anglia
-T 745833000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE      # East Anglia
-T 777833000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE      # East Anglia
-T 666000000 8MHz  3/4 NONE    QAM64   8k 1/32 NONE      # East Anglia
-T 706000000 8MHz  3/4 NONE    QAM64   8k 1/32 NONE      # East Anglia
-T2 0 16417 802000000 8MHz AUTO AUTO     AUTO AUTO AUTO AUTO     # East Anglia
+# 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
diff --git a/dvb-t/uk-TheWrekin b/dvb-t/uk-TheWrekin
index 435741c..a878a93 100644
--- a/dvb-t/uk-TheWrekin
+++ b/dvb-t/uk-TheWrekin
@@ -1,15 +1,15 @@
-# UK, The Wrekin
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 730000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, The Wrekin B
-T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 698000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 77af3c6..bb67831 100644
--- a/dvb-t/uk-Torosay
+++ b/dvb-t/uk-Torosay
@@ -1,10 +1,15 @@
-# UK, Torosay
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 514167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 538167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 6f57c1b..82a0f8a 100644
--- a/dvb-t/uk-TunbridgeWells
+++ b/dvb-t/uk-TunbridgeWells
@@ -1,10 +1,15 @@
-# UK, Tunbridge Wells
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 642167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 666167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 bc4ab0e..b90bacf 100644
--- a/dvb-t/uk-Waltham
+++ b/dvb-t/uk-Waltham
@@ -1,10 +1,15 @@
-# UK, Waltham
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 011c524..913c1eb 100644
--- a/dvb-t/uk-Wenvoe
+++ b/dvb-t/uk-Wenvoe
@@ -1,10 +1,15 @@
-# UK, Wenvoe
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 625833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 705833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 649833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 673833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 0d343c3..de8627a 100644
--- a/dvb-t/uk-WhitehawkHill
+++ b/dvb-t/uk-WhitehawkHill
@@ -1,10 +1,15 @@
-# UK, Whitehawk Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 746000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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 635f227..7e2d78e 100644
--- a/dvb-t/uk-WinterHill
+++ b/dvb-t/uk-WinterHill
@@ -1,9 +1,15 @@
-# UK, Winter Hill
-# Populated by J. Hornsby from a scan of active multiplexes
-# UK, Winter Hill B Ceased broadcasting on 02 December 2009
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 801833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+# <http://stakeholders.ofcom.org.uk/broadcasting/guidance/tech-guidance/transmitter-frequency/>
+#----------------------------------------------------------------------------------------------
+# 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  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