diff --git a/demod.py b/demod.py
index 420b9b5..8cac5d5 100755
--- a/demod.py
+++ b/demod.py
@@ -257,7 +257,7 @@ def mynormalize(v):
 print "final phase",phase
 
 # Nice output format
-p=re.compile('(.*)-(\d+)-f(\d+)')
+p=re.compile('(.*?)-(\d+)(?:-o[-+]\d+)?-f(\d+)')
 m=p.match(basename)
 if(m):
     rawfile=m.group(1)
diff --git a/iridium-parser.py b/iridium-parser.py
index 27cd3a1..a330be3 100755
--- a/iridium-parser.py
+++ b/iridium-parser.py
@@ -97,14 +97,14 @@ def __init__(self,line):
             ts+=float(self.timestamp)/1000
             self.globaltime=ts
             return
-        mm=re.match("i-(\d+(?:\.\d+)?)-[vbsr]1.([a-z])([a-z])",self.filename)
+        mm=re.match("i-(\d+(?:\.\d+)?)-[vbsrtl]1.([a-z])([a-z])",self.filename)
         if mm:
             b26=(ord(mm.group(2))-ord('a'))*26+ ord(mm.group(3))-ord('a')
             self.b26=b26
             ts=float(mm.group(1))+float(self.timestamp)/1000+b26*600
             self.globaltime=ts
             return
-        mm=re.match("i-(\d+(?:\.\d+)?)-[vbsr]1$",self.filename)
+        mm=re.match("i-(\d+(?:\.\d+)?)-[vbsrtl]1(?:-o[+-]\d+)?$",self.filename)
         if mm:
             ts=float(mm.group(1))+float(self.timestamp)/1000
             self.globaltime=ts
diff --git a/tools/view_baudline b/tools/view_baudline
index a12dfe2..efefac1 100755
--- a/tools/view_baudline
+++ b/tools/view_baudline
@@ -60,6 +60,10 @@ if [ -z "$r" ] ; then
 		f=1626354000
 		r=500000
 		;;
+	*-t*)
+		f=1626000000
+		r=1000000
+		;;
 	*)
 		echo "No idea... " >&2
 		f=0