diff --git a/doc/TechnicalReference/TechnicalReference.tex b/doc/TechnicalReference/TechnicalReference.tex
index 6a8eb4998eaad3d4c281306249ef14f80ee431cb..b81aa6a5732e6afdbadc9d5cfb15c9a18db05a37 100644
--- a/doc/TechnicalReference/TechnicalReference.tex
+++ b/doc/TechnicalReference/TechnicalReference.tex
@@ -780,7 +780,7 @@ returned by the \texttt{\_\_toProtDescr()} function as described in
 Section~\ref{subsubsec:effect}.
 
 \subsection{VarInfo} \label{subsec:varinfo}
-
+The VarInfo interface is a (soon to be deprecated) interface for LOVD~\cite{LOVDD}
 
 \subsection{UCSC\_Update} \label{subsec:ucsc_update}
 
diff --git a/src/Modules/GBparser.py b/src/Modules/GBparser.py
index a2c3ccdb746dbde0d487f74d1251f286c36d2ae8..4f8988f8c792ab265848ab66b11dca1e539d6a9c 100644
--- a/src/Modules/GBparser.py
+++ b/src/Modules/GBparser.py
@@ -481,7 +481,7 @@ class GBparser() :
                 #if
             #if
         #for
-        if record.molType == 'g' :
+        if record.molType in ['g', 'm'] :
             for j in geneDict.keys() :
                 myGene = geneDict[j]
                 self.link(myGene.rnaList, myGene.cdsList)
@@ -515,7 +515,8 @@ class GBparser() :
                     #if
                 #for
                 for i in myGene.cdsList :
-                    if not i.linked and i.usable :
+                    if not i.linked and \
+                       (i.usable or not geneDict[myGene.name].rnaList) :
                         myRealGene = record.findGene(i.gene)
                         if i.locus_tag :
                             myTranscript = Locus(i.locus_tag[-3:])
diff --git a/src/Modules/GenRecord.py b/src/Modules/GenRecord.py
index 8f8a3a86083a43e1fc58a3b4c8d92087c37fcb97..3670780382767177a242e5f3228cb2fd88264161 100644
--- a/src/Modules/GenRecord.py
+++ b/src/Modules/GenRecord.py
@@ -379,7 +379,7 @@ class GenRecord() :
                             #if
                             else :
                                 j.mRNA = j.CDS
-                                j.linkMethod = "construction"
+                            j.linkMethod = "construction"
                             j.transcribe = True
                             j.translate = True
                         #if
diff --git a/src/Mutalyzer.py b/src/Mutalyzer.py
index e2a72344cdeb0320cbf97af91653c625f6cfe9e4..0ad6fb85dc26f222301e25810353e0d431b262ec 100644
--- a/src/Mutalyzer.py
+++ b/src/Mutalyzer.py
@@ -1158,7 +1158,7 @@ def __ppp(MUU, parts, GenRecordInstance, O) :
                     W = GS.findLocus(toi)
                     if not W:
                         O.addMessage(__file__, 4, "ENOTRANSCRIPT",
-                            "Transcripts found for gene %s. Please " \
+                            "Multiple transcripts found for gene %s. Please " \
                             "choose from: %s" %(GS.name,
                                 ", ".join(GS.listLoci())))
                 else:                       # No transcript id given
@@ -1196,7 +1196,7 @@ def __ppp(MUU, parts, GenRecordInstance, O) :
                         W = GS.transcriptList[0]
                     else:
                         O.addMessage(__file__, 4, "ENOTRANSCRIPT",
-                            "Transcripts found for gene %s. Please " \
+                            "Multiple transcripts found for gene %s. Please " \
                             "choose from: %s" %(GS.name,
                             ", ".join(GS.listLoci())))
             #else
@@ -1258,7 +1258,7 @@ def __ppp(MUU, parts, GenRecordInstance, O) :
                 cdsm = Bio.Seq.reverse_complement(cdsm)
             #if
 
-            if '*' in cds.translate()[:-1] :
+            if '*' in cds.translate(table = W.txTable)[:-1] :
                 O.addMessage(__file__, 3, "ESTOP", "In frame stop codon found.")
                 return
             #if