diff --git a/Makefile b/Makefile
index 7a97b1c3f795d93b6191e8a5d3d157a691e2a282..beb492164fd1a582921d5490c8cb09ca0ecad240 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ build/%.pdf: %.tex lmschola.sty schoolbook.sty  $(TFMS)
 	cd build
 	fontforge -lang=ff -c 'Open($$1); Generate($$2)' ../$< $*.pfa $@
 
-$(ENCETX): tgoml.etx q-rm.enc make-enc-etx.tex
+$(ENCETX): make-enc-etx.tex 
 	cd build; $(TEXINPUT_QRM) fontinst make-enc-etx
 
 tgsmi.tfm tgsmbi.tfm oml-qcsri.tfm oml-qcsbi.tfm: build-omltgsm.tex \
@@ -55,7 +55,7 @@ tgsr.tfm tgsb.tfm: build-ot1tgsm.tex zeroAccentDepth.mtx \
 	pltotf misctgsb
 
 tgssy.tfm tgsbsy.tfm: build-fmstgssy.tex tgfms.etx \
-	      misctgs.afm misctgsb.afm unsetSection.mtx
+	      misctgs.afm misctgsb.afm unsetSection.mtx $(ENCETX)
 	cd build && $(TEXENV) fontinst build-fmstgssy
 	vptovf tgssy.vpl tgssy.vf tgssy.tfm
 	vptovf tgsbsy.vpl tgsbsy.vf tgsbsy.tfm
@@ -64,9 +64,9 @@ tgssy.tfm tgsbsy.tfm: build-fmstgssy.tex tgfms.etx \
 
 tgsex.tfm: build-tgsex.tex parentgs.afm zeroAccentDepthEx.mtx emx.etx \
            parentgs.afm unsetIntegrals.mtx specialkerningsExt.mtx \
-           misctgs.afm misctgsb.afm lmex10.pl
+           misctgs.afm misctgsb.afm $(LMEX)/lmex10.tfm $(ENCETX)
 	cd build
-	tftopl lmex10 lmex10
+	tftopl  $(LMEX)/lmex10 lmex10
 	$(TEXENV) fontinst build-tgsex
 	vptovf tgsex.vpl tgsex.vf tgsex.tfm
 	pltotf misctgs
@@ -79,15 +79,12 @@ ec-qcsr-scB.tfm ec-qcsb-scB.tfm: build-t1tgsc.tex $(ENCETX) \
 	vptovf ec-qcsr-scB.vpl ec-qcsr-scB.vf ec-qcsr-scB.tfm
 	vptovf ec-qcsb-scB.vpl ec-qcsb-scB.vf ec-qcsb-scB.tfm
 
+#lmex10.pl: $(LMEX)/lmex10.tfm
+#	cd build
+#	tftopl $(LMEX)/lmex10.tfm lmex10.pl
 
-
-
-lmex10.pl: $(LMEX)/lmex10.tfm
-	cd build
-	tftopl $(LMEX)/lmex10.tfm lmex10.pl
-
-q-rm.enc: $(QRM)/q-rm.enc
-	cp $(QRM)/q-rm.enc build
+#q-rm.enc: $(QRM)/q-rm.enc
+#	cp $(QRM)/q-rm.enc build
 
 
 
diff --git a/tests/pairs.tex b/tests/pairs.tex
index 775c97d704217930ef009ddbbdfbb5092ac7e245..d5be6a70507c043955f717894dfbade38d90d5c2 100644
--- a/tests/pairs.tex
+++ b/tests/pairs.tex
@@ -29,16 +29,17 @@
 %
 \def\x#1{c#1\quad}
 \contents
+\newpage
 %
 \def\x#1{d#1\quad}
 \contents
 %
 \def\x#1{e#1\quad}
 \contents
-\newpage
 %
 \def\x#1{f#1\quad}
 \contents
+\newpage
 %
 \def\x#1{g#1\quad}%
 \contents
@@ -48,30 +49,27 @@
 %
 \def\x#1{i#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{j#1\quad}%
 \contents
-\newpage
 %
 \def\x#1{k#1\quad}%
 \contents
 %
 \def\x#1{l#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{m#1\quad}%
 \contents
 %
-%
 \def\x#1{n#1\quad}%
 \contents
-\newpage
 %
 \def\x#1{o#1\quad}%
 \contents
-%
-\def\x#1{p#1\quad}%
-\contents
+\newpage
 %
 \def\x#1{p#1\quad}%
 \contents
@@ -81,8 +79,8 @@
 %
 \def\x#1{r#1\quad}%
 \contents
-\newpage
 %
+\newpage
 %
 \def\x#1{s#1\quad}%
 \contents
@@ -93,16 +91,17 @@
 %
 \def\x#1{u#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{v#1\quad}%
 \contents
 %
 \def\x#1{w#1\quad}%
 \contents
-\newpage
 %
 \def\x#1{x#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{y#1\quad}%
 \contents
@@ -112,16 +111,17 @@
 %
 \def\x#1{\alpha#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{\beta#1\quad}%
 \contents
-\newpage
 %
 \def\x#1{\gamma#1\quad}%
 \contents
 %
 \def\x#1{\delta#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{\epsilon#1\quad}%
 \contents
@@ -141,6 +141,7 @@
 %
 \def\x#1{\vartheta#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{\iota#1\quad}%
 \contents
@@ -148,9 +149,9 @@
 \def\x#1{\kappa#1\quad}%
 \contents
 %
-\newpage
 \def\x#1{\lambda#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{\mu#1\quad}%
 \contents
@@ -160,16 +161,17 @@
 %
 \def\x#1{\xi#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{\pi#1\quad}%
 \contents
 %
-\newpage
 \def\x#1{\varpi#1\quad}%
 \contents
 %
 \def\x#1{\rho#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{\varrho#1\quad}%
 \contents
@@ -189,6 +191,7 @@
 %
 \def\x#1{\varphi#1\quad}%
 \contents
+\newpage
 %
 \def\x#1{\chi#1\quad}%
 \contents
@@ -200,23 +203,3 @@
 \contents
 %
 \end{document}
-\newpage
-\lmnormal
-\begin{equation*}
-  y=f(x)
-\end{equation*}
-\mathversion{test}
-\begin{equation*}
-  y=f(x)
-\end{equation*}
-\newpage
-\mathversion{test}\selectfont
-\input{math-test-modified}
-\newpage
-\mathversion{normal}\selectfont
-\input{math-test-modified}
-
-\end{document}
-
-
-