diff --git a/src/formatitko/tex/formatitko.tex b/src/formatitko/tex/formatitko.tex
index 32e1023..284ed43 100644
--- a/src/formatitko/tex/formatitko.tex
+++ b/src/formatitko/tex/formatitko.tex
@@ -131,7 +131,7 @@
 	\parindent=0pt
 	\leftskip=0pt plus 0.2\hsize
 	\rightskip=0pt plus 0.2\hsize
-	\parfillskip=0pt plus 0.2\hsize
+	\parfillskip=0pt
 	\spaceskip=0.3333em
 	\settextsize{10}
 	#1
diff --git a/src/formatitko/tex/formatitkolib.tex b/src/formatitko/tex/formatitkolib.tex
index bf65019..690330b 100644
--- a/src/formatitko/tex/formatitkolib.tex
+++ b/src/formatitko/tex/formatitkolib.tex
@@ -55,9 +55,10 @@
 \def\unparskip{\vskip-\parskip}
 
 \catcode`@=11
-\def\vecoverrightarrow#1{\vbox{\m@th\ialign{##\crcr
+\def\vecoverrightarrow#1{\mathpalette\vecoverrightarrowtmp{#1}}
+\def\vecoverrightarrowtmp#1#2{\vbox{\m@th\ialign{##\crcr
       \vecrightarrowfill\crcr\noalign{\kern-\p@\kern 0.09em\nointerlineskip}
-      $\hfil\displaystyle{#1\,}\hfil$\crcr}}}
+      $\hfil#1{#2\,}\hfil$\crcr}}}
 \def\vecrightarrowfill{$\settextsize{5}\m@th\smash-\mkern-7mu%
   \cleaders\hbox{$\mkern-2mu\smash-\mkern-2mu$}\hfill
   \settextsize{5}\mkern-7mu\mathord\rightarrow$}
diff --git a/src/formatitko/tex/table_of_contents.tex b/src/formatitko/tex/table_of_contents.tex
index 5aa5d29..1435d2f 100644
--- a/src/formatitko/tex/table_of_contents.tex
+++ b/src/formatitko/tex/table_of_contents.tex
@@ -7,17 +7,16 @@
 
 \def\stdskip{\vskip 3pt}
 \def\tocsection#1#2#3#4{
-	{\settextsize{14}\line{\bf\hbox to 2em{#2\hfil}#4~\hfil\pagelink{#1}}\stdskip}
+	\line{\bf\hbox to 2em{#2\hfil}#4~\hfil\pagelink{#1}}
 }
 \def\tocsubsection#1#2#3#4{
-	\line{\hskip 1.5cm \hbox to 3em{#2\hfil}#4~\hfil\pagelink{#1}}\stdskip
+	\line{\hskip 1.5cm \hbox to 3em{#2\hfil}#4~\hfil\pagelink{#1}}
 }
 \def\tocsubsubsection#1#2#3#4{
-	\line{\hskip 3cm \hbox to 4em{#2\hfil}#4~\hfil\pagelink{#1}}\stdskip
+	\line{\hskip 3cm \hbox to 4em{#2\hfil}#4~\hfil\pagelink{#1}}
 }
 \def\tocpicture#1#2#3#4{}
 
 \vskip 1cm
 \input toc.aux
-
 }
diff --git a/src/formatitko/tex_generator.py b/src/formatitko/tex_generator.py
index 33eecad..7aac1c8 100644
--- a/src/formatitko/tex_generator.py
+++ b/src/formatitko/tex_generator.py
@@ -254,7 +254,7 @@ class UCWTexGenerator(OutputGenerator):
 			"AlignDefault": r"\quad#\quad\hfil"
 		}
 		self.writeln(r"\vskip1em")
-		self.writeln(r"\halign{\strut"+"&".join([aligns[col[0]] for col in e.colspec])+r"\cr")
+		self.writeln(r"\leavevmode\vbox{\halign{\strut"+"&".join([aligns[col[0]] for col in e.colspec])+r"\cr")
 		self.indent_more()
 		self.generate(e.head.content)
 		self.writeln(r"\noalign{\vskip 0.3em\hrule\vskip 0.3em}")
@@ -262,7 +262,7 @@ class UCWTexGenerator(OutputGenerator):
 		self.writeln(r"\noalign{\vskip 0.3em\hrule\vskip 0.3em}")
 		self.generate(e.foot.content)
 		self.indent_less()
-		self.writeln("}")
+		self.writeln("}}")
 		self.writeln(r"\vskip1em")
 
 	def generate_TableRow(self, e: TableRow):