diff --git a/lib/layouts/svcommon.inc b/lib/layouts/svcommon.inc
index 116072e515..8a99e6c786 100644
--- a/lib/layouts/svcommon.inc
+++ b/lib/layouts/svcommon.inc
@@ -688,13 +688,3 @@ InsetLayout Flex:Email
 	EndFont
 End
 
-InsetLayout Flex:and
-	ContentAsLabel	1
-	CustomPars	0
-	LatexName	and
-	LatexType	Command
-	LabelString	"and"
-	LyxType		Custom
-	KeepEmpty	1
-End
-
diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout
index 30e6231940..0abcd1d31c 100644
--- a/lib/layouts/svglobal3.layout
+++ b/lib/layouts/svglobal3.layout
@@ -82,18 +82,12 @@ InsetLayout Flex:CRSC
 	LabelString		"CR Subject Classification"
 End
 
-InsetLayout		Flex:at_Address
-       CopyStyle        Flex:and
-       LatexName	at
-       LabelString	"at address"
-End
-
 Style Problem
-      ObsoletedBy	Problem_(theorem-like)
+	RequiredArgs	0
 End
 
 Style Solution
-      ObsoletedBy	Solution_(theorem-like)
+	RequiredArgs	0
 End
 
 
diff --git a/lib/layouts/svmono.layout b/lib/layouts/svmono.layout
index 0d38685eee..c5468103bf 100644
--- a/lib/layouts/svmono.layout
+++ b/lib/layouts/svmono.layout
@@ -39,12 +39,6 @@ Style Solution
 	ObsoletedBy	Sol
 End
 
-InsetLayout	Flex:at_Address
-	CopyStyle	Flex:and
-	LatexName	at
-	LabelString	"at address"
-End
-
 Counter theorem
   Within	chapter
 End
diff --git a/lib/layouts/svmult.layout b/lib/layouts/svmult.layout
index 594ea99bf4..f34773a30b 100644
--- a/lib/layouts/svmult.layout
+++ b/lib/layouts/svmult.layout
@@ -157,12 +157,6 @@ End
 #	EndFont
 #End
 
-InsetLayout Flex:at_Address
-       CopyStyle	Flex:and
-       LatexName	at
-       LabelString	"at address"
-End
-
 Style Part
 	Category	"For editors"
 End
diff --git a/lib/templates/springer/acknow.lyx b/lib/templates/springer/acknow.lyx
index 11666de3a5..742ec697a7 100644
--- a/lib/templates/springer/acknow.lyx
+++ b/lib/templates/springer/acknow.lyx
@@ -62,6 +62,44 @@
 
 \begin_layout extrachap
 Acknowledgements
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+The 
+\begin_inset Quotes eld
+\end_inset
+
+extrachap
+\begin_inset Quotes erd
+\end_inset
+
+ layout appears unnumbered and not in the table of contents.
+ But the layout shares the behavior of 
+\begin_inset Quotes eld
+\end_inset
+
+Chapter
+\begin_inset Quotes erd
+\end_inset
+
+ with respect to headings.
+ This is different from 
+\begin_inset Quotes eld
+\end_inset
+
+Chapter*
+\begin_inset Quotes erd
+\end_inset
+
+ which continues to use the name of the last numbered chapter in the header
+ of left pages and the name of the last numbered section in the header of
+ right pages.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/templates/springer/appendix.lyx b/lib/templates/springer/appendix.lyx
index 32e4f65997..787135099b 100644
--- a/lib/templates/springer/appendix.lyx
+++ b/lib/templates/springer/appendix.lyx
@@ -149,8 +149,8 @@ eqnarray
  
 \begin_inset Formula 
 \begin{eqnarray}
-a\times b=c\nonumber \\
-\vec{a}\cdot\vec{b}=\vec{c}\label{eq:A01}
+a\times b & = & c\nonumber \\
+\vec{a}\cdot\vec{b} & = & c\label{eq:A01}
 \end{eqnarray}
 
 \end_inset
diff --git a/lib/templates/springer/chapter.lyx b/lib/templates/springer/chapter.lyx
index bf647a59fb..eb5ea049ad 100644
--- a/lib/templates/springer/chapter.lyx
+++ b/lib/templates/springer/chapter.lyx
@@ -275,8 +275,8 @@ boldface-italic
  
 \begin_inset Formula 
 \begin{eqnarray}
-a\times b=c\nonumber \\
-\vec{a}\cdot\vec{b}=\vec{c}\label{eq:01}
+a\times b & = & c\nonumber \\
+\vec{a}\cdot\vec{b} & = & c\label{eq:01}
 \end{eqnarray}
 
 \end_inset
@@ -1188,6 +1188,15 @@ Please note that the first line of text that follows a heading is not indented,
 \end_layout
 
 \begin_layout Theorem
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+Name/Title (optional)
+\end_layout
+
+\end_inset
+
 Theorem text goes here.
 \end_layout
 
diff --git a/lib/templates/springer/glossary.lyx b/lib/templates/springer/glossary.lyx
index 39b02e7ba8..1ec8c45969 100644
--- a/lib/templates/springer/glossary.lyx
+++ b/lib/templates/springer/glossary.lyx
@@ -62,6 +62,33 @@
 
 \begin_layout Extrachap
 Glossary
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+The layout 
+\begin_inset Quotes eld
+\end_inset
+
+Extrachap
+\begin_inset Quotes erd
+\end_inset
+
+ is similar to 
+\begin_inset Quotes eld
+\end_inset
+
+extrachap
+\begin_inset Quotes erd
+\end_inset
+
+ (as described in the note behind the Acknowledgement) but it is also listed
+ in the table of contents.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/templates/springer/svjour3.lyx b/lib/templates/springer/svjour3.lyx
index a865595b8c..dbaa46edb0 100644
--- a/lib/templates/springer/svjour3.lyx
+++ b/lib/templates/springer/svjour3.lyx
@@ -180,7 +180,7 @@ optional
 \end_layout
 
 \begin_layout Author
-First Author
+First Author 
 \begin_inset ERT
 status collapsed
 
@@ -239,7 +239,7 @@ Fax: +123-45-678910
 
 
 \begin_inset Flex Email
-status open
+status collapsed
 
 \begin_layout Plain Layout
 fauthor@example.com
@@ -442,6 +442,15 @@ Your text comes here.
 \end_layout
 
 \begin_layout Theorem
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+Name/Title (optional)
+\end_layout
+
+\end_inset
+
 a theorem
 \end_layout
 
@@ -450,7 +459,7 @@ a theorem
 status open
 
 \begin_layout Plain Layout
-Problem title
+Name/Title (optional)
 \end_layout
 
 \end_inset
@@ -463,7 +472,7 @@ Problem title
 status open
 
 \begin_layout Plain Layout
-Solution title
+Name/Title (optional)
 \end_layout
 
 \end_inset
diff --git a/lib/templates/springer/svmono_book.lyx b/lib/templates/springer/svmono_book.lyx
index 7bfc6357c3..597b16a666 100644
--- a/lib/templates/springer/svmono_book.lyx
+++ b/lib/templates/springer/svmono_book.lyx
@@ -168,7 +168,7 @@ filename "preface.lyx"
 status open
 
 \begin_layout Plain Layout
-optional:
+acknowledgements are optional:
 \end_layout
 
 \end_inset
diff --git a/lib/templates/springer/svmult_author.lyx b/lib/templates/springer/svmult_author.lyx
index 794ee2335a..af52600d3a 100644
--- a/lib/templates/springer/svmult_author.lyx
+++ b/lib/templates/springer/svmult_author.lyx
@@ -118,16 +118,19 @@ optional
 
 \begin_layout Institute
 Name of First Author 
-\begin_inset Flex at Address
-status open
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-N
+
+
+\backslash
+at 
 \end_layout
 
 \end_inset
 
-ame, Address of Institute, 
+Name, Address of Institute, 
 \begin_inset Flex Email
 status collapsed
 
@@ -137,27 +140,33 @@ name@email.address
 
 \end_inset
 
-
-\begin_inset Flex and
-status open
+ 
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-N
+
+
+\backslash
+and 
 \end_layout
 
 \end_inset
 
-ame of Second Author 
-\begin_inset Flex at Address
-status open
+Name of Second Author 
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-N
+
+
+\backslash
+at 
 \end_layout
 
 \end_inset
 
-ame, Address of Institute 
+Name, Address of Institute 
 \begin_inset Flex Email
 status collapsed
 
@@ -360,8 +369,8 @@ boldface-italic
  
 \begin_inset Formula 
 \begin{eqnarray}
-a\times b=c\nonumber \\
-\vec{a}\cdot\vec{b}=\vec{c}\label{eq:01}
+a\times b & = & c\nonumber \\
+\vec{a}\cdot\vec{b} & = & c\label{eq:01}
 \end{eqnarray}
 
 \end_inset
@@ -627,7 +636,7 @@ automatism for all your cross-references and citations as has already been
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:2"
+reference "sec:Section-Heading2"
 
 \end_inset
 
@@ -1245,6 +1254,15 @@ Please note that the first line of text that follows a heading is not indented,
 \end_layout
 
 \begin_layout Theorem
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+Name/Title (optional)
+\end_layout
+
+\end_inset
+
 Theorem text goes here.
 \end_layout