diff --git a/kalibrierschein/kalibrierschein.cls b/kalibrierschein/kalibrierschein.cls
index 2d970c4eccfc72fe0774041d9c21baa0cd5d2073..e9f13686d6bbe7008806c01a8ba932ae20a118da 100644
--- a/kalibrierschein/kalibrierschein.cls
+++ b/kalibrierschein/kalibrierschein.cls
@@ -6,7 +6,7 @@
 \newcommand*\ks@langs{ngerman,main=english}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{kalibrierschein}
-  [2015/12/10 v0.2b Dokumentenklasse (RN/PTB)]
+  [2017/12/01 v0.2c Dokumentenklasse (RN/PTB)]
 \DeclareOption{BS}{\def\ks@location{Braunschweig}}
 \DeclareOption{BLN}{\def\ks@location{Berlin}}
 \DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
@@ -34,17 +34,13 @@
 %\RequirePackage{showframe}
 
 \RequirePackage[\ks@langs]{babel}
-\RequirePackage{iflang}
 \RequirePackage[autostyle=true,german=guillemets,maxlevel=3]{csquotes}%
+\RequirePackage{iflang}
 \IfLanguageName{ngerman}{%
-  \typeout{ngerman}
   \AtEndOfClass{\shorthandon{"}}
   \defineshorthand{"`}{\openautoquote}
   \defineshorthand{"'}{\closeautoquote}
-  \AtBeginDocument{\sisetup{locale=DE}}
 }{%
-  \typeout{english}
-  \AtBeginDocument{\sisetup{locale=UK}}
 }
 \MakeAutoQuote{»}{«}
 \AtEndOfClass{%
@@ -333,32 +329,6 @@
 
 \RequirePackage{siunitx-PTB}
 
-\let\ke@orig@SI=\SI
-\renewcommand*\SI[2][]{% tolerant gegenüber "?" statt Zahl
-  \def\ks@tempa{#1}%
-  \edef\ks@tempb{\trim@spaces{#2}}%
-  \ks@SI@i
-}
-\newcommand*\ks@SI@i[2][]{%
-  \def\ks@tempc{?}%
-  \ifx\ks@tempb\ks@tempc
-    \ensuremath{\textbf{??}}\,\si[#1]{#2}%
-  \else
-    \edef\ks@tempe{\noexpand\ke@orig@SI[\ks@tempa]{\ks@tempb}[#1]{#2}}%
-    \ks@tempe
-  \fi
-}
-\let\ke@orig@num=\num
-\renewcommand*\num[1]{% tolerant gegenüber "?" statt Zahl
-  \edef\ks@tempb{\trim@spaces{#1}}%
-  \def\ks@tempc{?}%
-  \ifx\ks@tempb\ks@tempc
-    \ensuremath{\textbf{??}}%
-  \else
-    \ke@orig@num{#1}%
-  \fi
-}
-
 \newcommand\resultTable[3][]{%
   \@tempcnta=#2 %
   \@tempcntb=\numexpr(\@tempcnta-1)*2 %
diff --git a/kalibrierschein/siunitx-PTB.sty b/kalibrierschein/siunitx-PTB.sty
index 929082ca596f5813d0981b0f4a04b66274771569..f81907bc8940d2004b9ba4e450fa71a0210b811c 100644
--- a/kalibrierschein/siunitx-PTB.sty
+++ b/kalibrierschein/siunitx-PTB.sty
@@ -40,5 +40,40 @@
   }%
 }
 
+\let\ke@orig@SI=\SI
+\renewcommand*\SI[2][]{% tolerant gegenüber "?" statt Zahl
+  \def\ks@tempa{#1}%
+  \edef\ks@tempb{\trim@spaces{#2}}%
+  \ks@SI@i
+}
+\newcommand*\ks@SI@i[2][]{%
+  \def\ks@tempc{?}%
+  \ifx\ks@tempb\ks@tempc
+    \ensuremath{\textbf{??}}\,\si[#1]{#2}%
+  \else
+    \edef\ks@tempe{\noexpand\ke@orig@SI[\ks@tempa]{\ks@tempb}[#1]{#2}}%
+    \ks@tempe
+  \fi
+}
+\let\ke@orig@num=\num
+\renewcommand*\num[1]{% tolerant gegenüber "?" statt Zahl
+  \edef\ks@tempb{\trim@spaces{#1}}%
+  \def\ks@tempc{?}%
+  \ifx\ks@tempb\ks@tempc
+    \ensuremath{\textbf{??}}%
+  \else
+    \ke@orig@num{#1}%
+  \fi
+}
+
+\RequirePackage{iflang}
+\IfLanguageName{ngerman}{%
+  \typeout{ngerman}
+  \AtBeginDocument{\sisetup{locale=DE}}
+}{%
+  \typeout{english}
+  \AtBeginDocument{\sisetup{locale=UK}}
+}
+
 \endinput
 
diff --git a/kalibrierschein/test-ks-IK-2015.tex b/kalibrierschein/test-ks-IK-2015.tex
index 82f4991b199e6d26dff99246df57ea337a74cb31..61b06b09f4660980df5908a86dcebe2133c5aad4 100644
--- a/kalibrierschein/test-ks-IK-2015.tex
+++ b/kalibrierschein/test-ks-IK-2015.tex
@@ -1,7 +1,7 @@
 
 %---------------------------
 \listfiles
-\documentclass[de,IK,2015]{kalibrierschein}
+\documentclass[en,IK,2015]{kalibrierschein}
 \resultTable{ 6 }{%
 {\(p_{cal}\)}&{\(p_{ind}\)}&{\(p_r\)}&{\(p_{ind} - p_r\)}&{\(e\)}&{\(U(k=2)\)}\\
 mbar&mbar&mbar&mbar&&\\\toprule\endhead
diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls
index 06b09413513231c945a43a0d829c67dcdde8fff3..a11cd69f0d3508510dd264fda84b024a6ab65df2 100644
--- a/ptbletter/ptbletter.cls
+++ b/ptbletter/ptbletter.cls
@@ -4,7 +4,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{ptbletter}
-    [2017/11/30 v0.2a PTB-Brief-Klasse (RN)]
+    [2017/12/01 v0.2b PTB-Brief-Klasse (RN)]
 
 \let\ptb@tempdima=\@ovxx
 \let\ptb@tempdimb=\@ovyy
@@ -51,12 +51,14 @@
 ,backaddress=plain
 ,refline=nodate
 ,enlargefirstpage
+,pagenumber=no
+,parskip=never
 ]{scrlttr2}
 
 % Texbreite beibehalten, linken Rand anpassen
-\ptb@tempdima=\textwidth
-\RequirePackage[verbose,inner=72bp,textwidth=\ptb@tempdima]{geometry}
-%\textheight=1.1\textheight
+\oddsidemargin=0.0pt %
+\evensidemargin=34.7124pt %
+\raggedbottom
 
 \RequirePackage{hyphsubst}% Trennregeln austauschen
 \HyphSubstIfExists{ngerman-x-latest}{%