diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
index 1676d8da..6887696e 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Aberdare
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 250295df..4207a776 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Angus
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 8d1577d0..1b94f68b 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Beacon Hill
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 fee76dbf..cf2f4848 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Belmont
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 d05c95f6..335e0e04 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Bilsdale
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 ac8c2c1d..a0749427 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Black Hill
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 35dbade2..937488a7 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Blaenplwyf
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 096d08b2..fed0a5fc 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Bluebell Hill
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 c77bfb07..c12f40eb 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Bressay
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 20b32479..261afe40 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Brierley Hill
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 c84c2240..00000000
--- 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 00000000..753d815d
--- /dev/null
+++ b/dvb-t/uk-BristolIlchesterCrescent
@@ -0,0 +1,15 @@
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Bristol Ilchester Crescent
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 e3425ee7..955a9394 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Bristol Kings Weston
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 efca5873..a1b98db6 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Bromsgrove
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 d8ad2386..f6d486f6 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Brougher Mountain
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 75f29522..9895c63c 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Caldbeck
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 90f6eef4..7534a80c 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Caradon Hill
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 32372c50..12338e2f 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Carmel
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 fe42d13c..aff98d0d 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Chatton
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 ae6b88f8..1da954f1 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Chesterfield
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 63bb5d46..84417b20 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Craigkelly
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 9251b815..9a61bf1f 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)
-#! 20120112 1 0 TERRESTRIAL GB
-#------------------------------------------------------------------------------
-# location and provider: Crystal Palace, UK
-# date (yyyy-mm-dd) : 2012-02-12
+#----------------------------------------------------------------------------------------------
+# Auto-generated from:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Crystal Palace
+# date (yyyy-mm-dd) : 2013-09-18
#
-# T[2] [plp_id] [system_id] [# 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] [] [# 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 4fa63828..b00ad96c 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Darvel
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 38363752..0809af1c 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Divis
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 137b49f3..edee7d21 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Dover
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 851f0f3a..6ffafab4 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Durris
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 09926561..204c8a54 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Eitshal
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 af576493..477f19ed 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Emley Moor
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2] [] [# 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 f9f3da54..06dd3c63 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:
+#
+#----------------------------------------------------------------------------------------------
+# location and provider: UK, Fenham
+# date (yyyy-mm-dd) : 2013-09-18
+#
+# T[2]