diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index df74535c..64264ab1 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -1406,8 +1406,6 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 			return 'U';
 		if ("MET".equals(ucType))
 			return 'U';
-		// if ("M".equals(normalizedType)) // Metro
-		// return "U" + normalizedName;
 
 		// Tram
 		if (P_LINE_TRAM.matcher(ucType).matches()) // Generic Tram
@@ -1416,8 +1414,6 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 			return 'T';
 		if ("TRA".equals(ucType))
 			return 'T';
-		// if ("T".equals(normalizedType)) // Tram
-		// return "T" + normalizedName;
 
 		// Bus
 		if (P_LINE_BUS.matcher(ucType).matches()) // Generic Bus
@@ -1450,14 +1446,14 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 			return 'B';
 		// if ("N".equals(normalizedType)) // Nachtbus
 		// return "B" + normalizedName;
-		// if ("TX".equals(normalizedType)) // Taxi
-		// return "B" + normalizedName;
 
 		// Ferry
 		if ("SCHIFF".equals(ucType))
 			return 'F';
 		if ("FÄHRE".equals(ucType))
 			return 'F';
+		if ("FAE".equals(ucType))
+			return 'F';
 		if ("SCH".equals(ucType)) // Schiff
 			return 'F';
 		if ("AS".equals(ucType)) // SyltShuttle, eigentlich Autoreisezug
diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index d78e8567..9049a64e 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -797,6 +797,8 @@ public final class BahnProvider extends AbstractHafasProvider
 				return "SDPN" + number;
 			if (type.equals("WKD")) // Warszawska Kolej Dojazdowa (Warsaw Suburban Railway)
 				return "SWKD" + number;
+			if (type.equals("SE")) // S-Bahn Kopenhagen
+				return "SE" + number;
 
 			if (type.equals("U"))
 				return "UU" + number;
@@ -836,6 +838,8 @@ public final class BahnProvider extends AbstractHafasProvider
 				return "BRFB" + type.substring(3) + number;
 			if (type.equals("RNV")) // Rhein-Neckar-Verkehr GmbH - TODO aufteilen in Tram/Bus/Fähre
 				return "BRNV" + number;
+			if (type.equals("LTT"))
+				return "BLTT" + number;
 
 			if (type.equals("Fähre"))
 				return "F" + number;
diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java
index 103772db..dae2c231 100644
--- a/src/de/schildbach/pte/RmvProvider.java
+++ b/src/de/schildbach/pte/RmvProvider.java
@@ -287,6 +287,8 @@ public class RmvProvider extends AbstractHafasProvider
 				return "RRB" + number;
 			if (type.equals("RE")) // RegionalExpress
 				return "RRE" + number;
+			if (type.equals("IRE")) // Interregio Express
+				return "RIRE" + number;
 			if (type.equals("SE")) // StadtExpress
 				return "RSE" + number;
 			if (type.equals("R"))
diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java
index 6172a830..b102348d 100644
--- a/src/de/schildbach/pte/SbbProvider.java
+++ b/src/de/schildbach/pte/SbbProvider.java
@@ -141,18 +141,18 @@ public class SbbProvider extends AbstractHafasProvider
 	{
 		final String ucType = type.toUpperCase();
 
-		if (ucType.equals("IN")) // Italien Roma-Lecce
+		if ("IN".equals(ucType)) // Italien Roma-Lecce
 			return 'I';
 
-		if (ucType.equals("E"))
+		if ("E".equals(ucType))
 			return 'R';
-		if (ucType.equals("T"))
+		if ("T".equals(ucType))
 			return 'R';
 
-		if (ucType.equals("M")) // Metro Wien
+		if ("M".equals(ucType)) // Metro Wien
 			return 'U';
 
-		if (ucType.equals("TX"))
+		if ("TX".equals(ucType))
 			return 'B';
 
 		final char t = super.normalizeType(type);
diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java
index 2dc6fa84..d0ee45e5 100644
--- a/src/de/schildbach/pte/SncbProvider.java
+++ b/src/de/schildbach/pte/SncbProvider.java
@@ -206,31 +206,33 @@ public class SncbProvider extends AbstractHafasProvider
 	{
 		final String ucType = type.toUpperCase();
 
-		if (ucType.equals("INT")) // Zürich-Brüssel
+		if ("INT".equals(ucType)) // Zürich-Brüssel
 			return 'I';
-		if (ucType.startsWith("IC "))
+		if ("IC ".startsWith(ucType))
+			return 'I';
+		if ("THA".equals(ucType)) // Thalys
 			return 'I';
 
-		if (ucType.startsWith("IR "))
+		if ("IR ".startsWith(ucType))
 			return 'R';
 
-		if (ucType.equals("L"))
+		if ("L".equals(ucType))
 			return 'R';
-		if (ucType.equals("P"))
+		if ("P".equals(ucType))
 			return 'R';
-		if (ucType.equals("CR"))
+		if ("CR".equals(ucType))
 			return 'R';
-		if (ucType.equals("ICT")) // Brügge
+		if ("ICT".equals(ucType)) // Brügge
 			return 'R';
-		if (ucType.equals("TRN")) // Mons
+		if ("TRN".equals(ucType)) // Mons
 			return 'R';
 
-		if (ucType.equals("MÉT"))
+		if ("MÉT".equals(ucType))
 			return 'U';
-		if (ucType.equals("MÉTRO"))
+		if ("MÉTRO".equals(ucType))
 			return 'U';
 
-		if (ucType.equals("TRAMWAY"))
+		if ("TRAMWAY".equals(ucType))
 			return 'T';
 
 		final char t = super.normalizeType(type);
diff --git a/src/de/schildbach/pte/ZvvProvider.java b/src/de/schildbach/pte/ZvvProvider.java
index 186f5d1a..b0eaf033 100644
--- a/src/de/schildbach/pte/ZvvProvider.java
+++ b/src/de/schildbach/pte/ZvvProvider.java
@@ -150,15 +150,11 @@ public class ZvvProvider extends AbstractHafasProvider
 
 		if ("D-SCHIFF".equals(ucType))
 			return 'F';
-		if ("FAE".equals(ucType))
-			return 'F';
 
 		if ("BERGBAHN".equals(ucType))
 			return 'C';
 		if ("SEILBAHN".equals(ucType))
 			return 'C';
-		if ("SL".equals(ucType)) // Sessel-Lift
-			return 'C';
 
 		if ("UNB".equals(ucType))
 			return '?';