diff --git a/Makefile b/Makefile
index c7cdb7a..81c6910 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@
 MAKEDIRS 	= $(DTXDIRS)
 TDSCOLL 	?= $(shell basename $$PWD)
 DISTDIRS	= $(DTXDIRS)
+TDS.README 	= README
 
 # targets for repository maintenance
 all clean distclean: 
diff --git a/base/proposal-blx.bib b/base/proposal-blx.bib
index 4622978..0bf384d 100644
--- a/base/proposal-blx.bib
+++ b/base/proposal-blx.bib
@@ -1,5 +1,5 @@
 @Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.1 $}
+@Comment{$ biblatex version 2.6 $}
 Do not modify this file!
 
 This is an auxiliary file used by the 'biblatex' package.
@@ -7,5 +7,5 @@ This file may safely be deleted. It will be recreated as
 required.
 
 @Control{biblatex-control,
-  options = {2.1:0:0:1:0:0:1:1:0:1:0:0:12:1:3:1:79:+},
+  options = {2.6:0:0:1:0:0:1:1:0:1:0:0:12:1:3:1:79:+},
 }
diff --git a/base/proposal.dtx b/base/proposal.dtx
index 2cbafdd..007537a 100644
--- a/base/proposal.dtx
+++ b/base/proposal.dtx
@@ -28,8 +28,8 @@
 \RecordChanges
 \usepackage{textcomp,url,paralist,a4wide,xspace}
 \usepackage[show]{ed}
-\usepackage[maxbibnames=6,hyperref=auto,style=alphabetic]{biblatex}
-\bibliography{proposal}
+\usepackage[maxbibnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
+\addbibresource{../lib/proposal.bib}
 \usepackage[bookmarks=true,linkcolor=blue,
  citecolor=blue,urlcolor=blue,colorlinks=true,
  breaklinks=true, bookmarksopen=true]{hyperref}
diff --git a/base/proposal.pdf b/base/proposal.pdf
index a034b67..429e172 100644
Binary files a/base/proposal.pdf and b/base/proposal.pdf differ
diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx
index 8e9348b..a33d6b0 100644
--- a/dfg/dfgproposal.dtx
+++ b/dfg/dfgproposal.dtx
@@ -28,8 +28,8 @@
 \RecordChanges
 \usepackage{textcomp,url,paralist,a4wide,xspace}
 \usepackage[show]{ed}
-\usepackage[maxnames=6,hyperref=auto,style=alphabetic]{biblatex}
-\bibliography{proposal}
+\usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
+\addbibresource{../lib/proposal.bib}
 \usepackage[bookmarks=true,linkcolor=blue,
  citecolor=blue,urlcolor=blue,colorlinks=true,
  breaklinks=true, bookmarksopen=true]{hyperref}
diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf
index 13ab59e..2ee70de 100644
Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ
diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf
index 12aac93..742a8e1 100644
Binary files a/dfg/examples/proposal/proposal.pdf and b/dfg/examples/proposal/proposal.pdf differ
diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf
index 216997d..4240852 100644
Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ
diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf
index 6d479b1..b0190d6 100644
Binary files a/dfg/examples/simple-proposal/proposal.pdf and b/dfg/examples/simple-proposal/proposal.pdf differ
diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx
index a61d9b6..c9d1e6d 100644
--- a/eu/euproposal.dtx
+++ b/eu/euproposal.dtx
@@ -28,8 +28,8 @@
 \RecordChanges
 \usepackage{textcomp,url,paralist,a4wide,xspace}
 \usepackage[show]{ed}
-\usepackage[maxnames=6,hyperref=auto,style=alphabetic]{biblatex}
-\bibliography{proposal}
+\usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
+\addbibresource{../lib/proposal.bib}
 \usepackage[bookmarks=true,linkcolor=blue,
  citecolor=blue,urlcolor=blue,colorlinks=true,
  breaklinks=true, bookmarksopen=true]{hyperref}
diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf
index aa39490..5e53948 100644
Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ
diff --git a/eu/examples/Makefile b/eu/examples/Makefile
index d956d99..fbcd447 100644
--- a/eu/examples/Makefile
+++ b/eu/examples/Makefile
@@ -1,3 +1,3 @@
-DIRS = strep fetopenstrep
+DIRS = strep 
 all: 
 	@for d in $(DIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
diff --git a/eu/examples/README b/eu/examples/README
index b87645e..d58ea03 100644
--- a/eu/examples/README
+++ b/eu/examples/README
@@ -1,6 +1,5 @@
-This directory contains examples for EU proposals and reports marked up with the 
+lThis directory contains examples for EU proposals and reports marked up with the 
 proposal/euproposal class. 
 
 strep:        a STREP
-fetopenstrep: the variant for FET Open
 lib: 		 shared files (affiliation database, bibTeX, logos)
diff --git a/eu/examples/fetopenstrep/Makefile b/eu/examples/fetopenstrep/Makefile
deleted file mode 100644
index 9b4a6fd..0000000
--- a/eu/examples/fetopenstrep/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-###########################################################################
-# Automating proposal management by make.
-# The participants work on proposal.tex in "draft" mode, which gives a lot
-# of information to the developers. Variants submit.tex and public.tex are
-# used to prepare official versions (hiding development/private info). 
-###########################################################################
-# possibly customize the following variables to your setting
-PROPOSAL = propB.tex 		# the proposal
-BIB = ../lib/dummy.bib	        # bibTeX databases
-PROP.dir = ../../..
-###########################################################################
-# the following are computed
-TSIMP = 			                  # pdflatex Targets without bibTeX
-TSIMP.pdf 	= $(TSIMP:%.tex=%.pdf)            # PDFs to be produced
-TBIB = $(PROPOSAL) 		  	  	  # pdflatex Targets with bibTeX
-TARGET = $(TSIMP) $(TBIB)                         # all pdflatex targets
-TBIB.pdf 	= $(TBIB:%.tex=%.pdf)         	  # PDFs to be produced
-TBIB.aux 	= $(TBIB:%.tex=%.aux)             # their aux files.
-PDATA 		= $(PROPOSAL:%.tex=%.pdata)       # the proposal project data
-SRC = $(filter-out $(TARGET),$(shell ls *.tex))   # included files
-PDFLATEX = pdflatex -interaction batchmode -file-line-error
-BBL.base = 1 2 3 4
-BBL = $(PROPOSAL:%.tex=%.bbl) $(BBL.base:%=$(PROPOSAL:%.tex=%)%-blx.bbl)
-PROPCLS.dir = $(PROP.dir)/base
-PROPETC.dir = $(PROP.dir)/etc
-EUPROPCLS.dir = $(PROP.dir)/eu
-TEXINPUTS := .//:$(PROPCLS.dir)//:$(EUPROPCLS.dir)//:$(PROPETC.dir)//:
-BIBINPUTS := ../lib:$(BIBINPUTS)
-PROPCLS.clssty = proposal.cls pdata.sty
-PROPETC.sty = workaddress.sty metakeys.sty sref.sty
-EUPROPCLS.clssty = euproposal.cls
-PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(EUPROPCLS.clssty:%=$(EUPROPCLS.dir)/%) $(PROPETC.sty:%=$(PROPETC.dir)/%)
-
-all: $(TBIB.pdf) $(TSIMP.pdf)
-
-submit:
-	$(MAKE) -w PROPOSAL=final.tex all
-
-public:
-	$(MAKE) -w PROPOSAL=public.tex all
-
-bbl:	$(BBL)
-$(BBL): %.bbl: %.aux
-	bibtex -min-crossrefs=100 -terse $<
-
-$(TSIMP.pdf): %.pdf: %.tex $(PROPCLS) $(PDATA)
-	$(PDFLATEX) $< || $(RM) $@
-
-$(PDATA): %.pdata: %.tex
-	$(PDFLATEX) $<
-
-$(TBIB.aux): %.aux: %.tex
-	$(PDFLATEX) $<
-
-$(TBIB.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS) 
-	$(PDFLATEX) $<  || $(RM) $@
-	sort $(PROPOSAL:%.tex=%.delivs) > $(PROPOSAL:%.tex=%.deliverables)
-	@if (test -e $(patsubst %.tex, %.idx,  $<));\
-	    then makeindex $(patsubst %.tex, %.idx,  $<); fi
-	$(MAKE) -$(MAKEFLAGS) $(BBL)
-	@if (grep "(re)run BibTeX" $(patsubst %.tex, %.log,  $<)> /dev/null);\
-	    then $(MAKE) -B $(BBL); fi
-	$(PDFLATEX)  $< || $(RM) $@
-	@if (grep Rerun $(patsubst %.tex, %.log,  $<) > /dev/null);\
-	   then $(PDFLATEX)  $<  || $(RM) $@; fi
-	@if (grep Rerun $(patsubst %.tex, %.log,  $<) > /dev/null);\
-	    then $(PDFLATEX)  $<  || $(RM) $@; fi
-
-clean: 
-	rm -f *.log *.blg *~ *.synctex.gz *.cut
-
-distclean: clean
-	rm -f *.aux *.out *.run.xml *.bbl *.toc *.deliv* *.pdata
-	rm -Rf auto
-
-echo:
-	echo $(BBL)
diff --git a/eu/examples/fetopenstrep/README b/eu/examples/fetopenstrep/README
deleted file mode 100644
index 72aee78..0000000
--- a/eu/examples/fetopenstrep/README
+++ /dev/null
@@ -1,14 +0,0 @@
-An Exapmle for euproposal.cls
-
-proposal.tex              is a fake EU proposal that shows all elements of euproposal.cls
-			  in action.
-*.tex			  the rest are intemediate files
-Makefile                  allows the automation via a unix Makefile on the author's 
-			  machine, adapt it to your needs
-
-Copyright(c) 2010 Michael Kohlhase
-The package is distributed under the terms of the LaTeX Project Public License (LPPL)
-
-The development version of this package can be found at
-https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/euproposal
-
diff --git a/eu/examples/fetopenstrep/breakthrough.tex b/eu/examples/fetopenstrep/breakthrough.tex
deleted file mode 100644
index ab2710d..0000000
--- a/eu/examples/fetopenstrep/breakthrough.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\section{Targeted breakthrough and long-term vision}\label{sec:objectives}
-\begin{todo}{from the proposal template}
-  Describe the breakthrough(s) that you are targeting to achieve. What is the long-term
-  vision (scientific, technological, societal, other) that motivates this breakthrough?
-  Explain how this breakthrough is an essential step towards the achievement of your
-  long-term vision, in particular in terms of new forms and uses of information and
-  information technologies. Describe the concrete objectives that you consider to
-  constitute the proof-of-concept of such a breakthrough. The objectives should be those
-  that you consider achievable within the project, in spite of the inherent risks. They
-  should be stated in a verifiable form, including through the milestones that will be
-  indicated under Section 1.3 below.
-\end{todo}
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "propB"
-%%% End: 
diff --git a/eu/examples/fetopenstrep/impact.tex b/eu/examples/fetopenstrep/impact.tex
deleted file mode 100644
index 5c1e844..0000000
--- a/eu/examples/fetopenstrep/impact.tex
+++ /dev/null
@@ -1,36 +0,0 @@
-\chapter{Impact}\label{chap:impact}
-\ednote{Maximum length for the whole of Section 3 –-- ten pages}
-\begin{todo}{from the proposal template}
-``Contribution to the scientific foundations of future information and communication technologies that
-may be radically different from present day ICT. It may, for example, open new avenues for science and
-technology, or lead to a paradigm shift in the way technologies are conceived or applied. FET-Open research is not required to have direct short-term technological or societal impact but it will take concrete
-steps towards achieving its long-term vision, supported by a critical exploration of the potential implications for the environment and for society.''
-
-``All FET-Open activities should contribute to securing and strengthening the future potential for high-risk / high-impact visionary research. To achieve this, FET-Open is expected to generate new collaborations involving a broad range of disciplines, the established scientists as well as the talented young ones, and a diversity of actors in research, including small and independent research organisations and high-tech SMEs, whenever relevant in terms of the activities proposed. International collaboration should exploit synergies in the global science and technology scene, to increase impact and to raise the level of excellence world-wide.''
-\end{todo}
-\section{Transformational impact on science, technology and/or society}\label{sec:transformational-impact}
-\begin{todo}{from the proposal template}
-      If successful, what would be the transformative impact of your project? What difference will it make, especially in terms of long-lasting changes on science, technology, society or theories? Mention the steps that will be needed after the project to bring about these impacts. Explain why this contribution requires a European (rather than a national or local) approach. Indicate how account is taken of other national or international research activities. Mention any assumptions and external factors that may determine whether the impacts will be achieved.
-\end{todo}
-\section{Contribution at the European level towards the expected impacts listed in the work programme}\label{sec:european-contribution}
-\begin{todo}{from the proposal template}
-      Explain how your project contributes to securing and strengthening the future potential for high-risk / high-impact visionary research, through its results or through the organisation of the work and collaborations within your consortium . Will you generate new diverse collaborations, or impact on current practice in this kind of research? Where relevant, highlight how international collaboration exploits synergies in the global science and technology scene, increases impact and raises the level of excellence world-wide.
-\end{todo}
-
-\section{Dissemination and/or Use of Project Results}\label{sec:outreach}
-
-\begin{todo}{from the proposal template}
-      Describe the measures you propose for the dissemination and/or exploitation of project results, and how these will increase the impact of the project. In designing these measures, you should take into account a variety of communication means and target groups as appropriate (e.g. policy-makers, interest groups, media and the public at large).
-
-For more information on communication guidance, see the URL \url{http://ec.europa.eu/research/science-society/science-communication/index_en.htm}
-
-      Describe also your plans for the management of knowledge (intellectual property) acquired in the course of the project.
-\end{todo}
-
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "propB"
-%%% End: 
-
-% LocalWords:  ednote
diff --git a/eu/examples/fetopenstrep/implementation.tex b/eu/examples/fetopenstrep/implementation.tex
deleted file mode 100644
index 5a01dc6..0000000
--- a/eu/examples/fetopenstrep/implementation.tex
+++ /dev/null
@@ -1,99 +0,0 @@
-\chapter{Implementation}\label{chap:implementation}
-
-\section{Management Structure and Procedures}\label{chap:management}
-\begin{todo}{from the proposal template}
-  Describe the organizational structure and decision-making mechanisms
-  of the project. Show how they are matched to the nature, complexity
-  and scale of the project.  Maximum length of this section: five pages.
-\end{todo}
-
-The Project Management of {\pn} is based on its Consortium Agreement, which will be
-signed before the Contract is signed by the Commission. The Consortium Agreement will
-enter into force as from the date the contract with the European Commission is signed.
-\subsection{Organizational structure}\label{sec:management-structure}
-\subsection{Risk Assessment and Management}
-\subsection{Information Flow and Outreach}\label{sec:spread-excellence}
-\subsection{Quality Procedures}\label{sec:quality-management}
-\subsection{Internal Evaluation Procedures}
-\newpage
-\section{Individual Participants}\label{sec:partners}
-\begin{todo}{from the proposal template}
-For each participant in the proposed project, provide a brief description of the legal entity, the main
-tasks they have been attributed, and the previous experience relevant to those tasks. Provide also a
-short profile of the individuals who will be undertaking the work.\\
-Maximum length for Section 2.2: one page per participant. However, where two or more departments within
-an organisation have quite distinct roles within the proposal, one page per department is acceptable.\\
-The maximum length applying to a legal entity composed of several members, each of which is a separate
-legal entity (for example an EEIG1), is one page per member, provided that the members have quite distinct
-roles within the proposal.
-\end{todo}
-\newpage
-\input{../strep/site-jacu}\newpage
-\input{../strep/site-efo}\newpage
-\input{../strep/site-bar}\newpage
-\input{../strep/site-baz}\newpage
-
-\section{The {\protect\pn} consortium as a whole}
-\begin{todo}{from the proposal template}
-  Describe how the participants collectively constitute a consortium capable of achieving
-  the project objectives, and how they are suited and are committed to the tasks assigned
-  to them. Show the complementarity between participants. Explain how the composition of
-  the consortium is well-balanced in relation to the objectives of the project.  
-
-  If appropriate describe the industrial/commercial involvement to ensure exploitation of
-  the results. Show how the opportunity of involving SMEs has been addressed
-\end{todo}
-
-The project partners of the \pn project have a long history of successful collaboration;
-Figure~\ref{fig:collaboration} gives an overview over joint projects (including proposals) and
-joint publications (only international, peer reviewed ones).
-
-\jointpub{jacu}{efo}
-\jointpub{efo}{baz}
-\jointproj{efo}{baz}
-\coherencetable
-
-\subsection{Subcontracting}\label{sec:subcontracting}
-\begin{todo}{from the proposal template}
-  If any part of the work is to be sub-contracted by the participant responsible for it,
-  describe the work involved and explain why a sub-contract approach has been chosen for
-  it.
-\end{todo}
-\subsection{Other Countries}\label{sec:other-countries}
-\begin{todo}{from the proposal template}
-  If a one or more of the participants requesting EU funding is based outside of the EU
-  Member states, Associated countries and the list of International Cooperation Partner
-  Countries\footnote{See CORDIS web-site, and annex 1 of the work programme.}, explain in
-  terms of the project’s objectives why such funding would be essential.
-\end{todo}
-
-\subsection{Additional Partners}\label{sec:assoc-partner}
-\begin{todo}{from the proposal template}
-  If there are as-yet-unidentified participants in the project, the expected competences,
-  the role of the potential participants and their integration into the running project
-  should be described
-\end{todo}
-\section{Resources to be Committed}\label{sec:resources}
-\begin{todo}{from the proposal template}
-Maximum length: two pages
-
-Describe how the totality of the necessary resources will be mobilized, including any resources that
-will complement the EC contribution. Show how the resources will be integrated in a coherent way,
-and show how the overall financial plan for the project is adequate.
-
-In addition to the costs indicated on form A3 of the proposal, and the effort shown in Section 1.3
-above, please identify any other major costs (e.g. equipment). Ensure that the figures stated in Part B
-are consistent with these.
-\end{todo}
-
-\subsection{Travel Costs and Consumables}\label{sec:travel-costs}
-\subsection{Subcontracting Costs}
-\subsection{Other Costs}
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "propB"
-%%% End: 
-
-% LocalWords:  pn newpage site-jacu site-efo site-baz jointpub efo baz
-% LocalWords:  jointproj coherencetable assoc-partner
diff --git a/eu/examples/fetopenstrep/methodology.tex b/eu/examples/fetopenstrep/methodology.tex
deleted file mode 100644
index 54ccc60..0000000
--- a/eu/examples/fetopenstrep/methodology.tex
+++ /dev/null
@@ -1,57 +0,0 @@
-\section[S/T Methodology]{S/T Methodology\footnote{Note that, whereas the scientific and technological methodology is evaluated
-under the criteria ‘S/T quality’, the quality of the
-actual workplan is evaluated under FET-Open under the criteria ‘Implementation’.}}\label{sec:methodology}
-\begin{todo}{from the proposal template}
-Provide a detailed description of the scientific and technological approach or methodology
-by which you will attempt to reach your objectives. Demonstrate that you are aware of the
-level and nature of the risks of failure, and that you have a good idea on how to address
-these risks. Describe a progression of crucial milestones and decision points for your
-project, and their expected timing. What would constitute success? What would you learn
-from an eventual failure? Where relevant, show how your approach takes into account the
-difficulties inherent to the multi-disciplinary nature of the idea or approach that you
-are proposing. 
- A detailed work plan should be presented, broken down into work
-packages\footnote{A work package is a major sub-division of the proposed project with a
-  verifiable end-point – normally a deliverable or an important milestone in the overall
-  project.} (WPs) which should follow the logical phases of the implementation of the
-project, and include consortium management and assessment of progress and results. (Note
-that your overall approach to management will be described later, in Section 2).
-
-Notes: The number of work packages used must be appropriate to the complexity of the work
-and the overall value of the proposed project. The planning should be sufficiently
-detailed to justify the proposed effort and allow progress monitoring by the Commission.
-
-\end{todo}
-\newpage\input{workplan}
-
-\newpage
-\subsection{Work Package List}\label{sec:wplist}
-
-\begin{todo}{from the proposal template}
-Please indicate one activity per work package:
-RTD = Research and technological development; DEM = Demonstration; MGT = Management of the consortium
-\end{todo}
-
-%\makeatletter\wp@total@RM{management}\makeatother
-\wpfig[pages,type]
-
-\newpage\input{../strep/deliverables}
-\newpage\input{../strep/milestones}
-
-\subsection{Work Package Descriptions}\label{sec:workpackages}
-\begin{workplan}
-\input{../strep/wp-management}\newpage
-\input{../strep/wp-dissem}\newpage
-\input{../strep/wp-class}\newpage
-\input{../strep/wp-temple}\newpage
-\end{workplan}
-\newpage\input{../strep/risks}
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "propB"
-%%% End: 
-
-% LocalWords: workplan newpage wplist makeatletter makeatother wpfig
-% LocalWords:  workpackages wp-dissem wp-class wp-temple
diff --git a/eu/examples/fetopenstrep/novelty.tex b/eu/examples/fetopenstrep/novelty.tex
deleted file mode 100644
index 161329c..0000000
--- a/eu/examples/fetopenstrep/novelty.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\section{Novelty and foundational character}\label{sec:progress}
-\begin{todo}{from the proposal template}
-  Describe the state-of-the-art in the area(s) concerned, and the advance that the
-  proposed project would bring about. Clearly describe the novelty of your proposal. In
-  what way do you challenge current thinking or assumptions? Novelty should come from new
-  ideas, not from the incremental refinement of existing approaches. It can also come from
-  new and unexpected combinations of insights from various disciplines. What is the
-  scientific foundation that you aim to develop and what are the specific contributions to
-  science and technology that your project will make (including in case of failure)?
-\end{todo}
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "propB"
-%%% End: 
diff --git a/eu/examples/fetopenstrep/propB.pdf b/eu/examples/fetopenstrep/propB.pdf
deleted file mode 100644
index b6a5b4c..0000000
Binary files a/eu/examples/fetopenstrep/propB.pdf and /dev/null differ
diff --git a/eu/examples/fetopenstrep/propB.tex b/eu/examples/fetopenstrep/propB.tex
deleted file mode 100644
index 503ce66..0000000
--- a/eu/examples/fetopenstrep/propB.tex
+++ /dev/null
@@ -1,65 +0,0 @@
-% The main file for developing the proposal. 
-% Variants with different class options are 
-% - submit.tex (no draft stuff, no ednotes, no revision information)
-% - public.tex (like submit.tex, but no financials either) 
-\providecommand{\classoptions}{,keys} % to be overwritten in variants
-\documentclass[noworkareas,deliverables,gitinfo,propB\classoptions]{euproposal}
-%\usepackage[T1]{fontenc}
-%\usepackage[utf8]{inputenc}
-%\addbibresource{../lib/dummy}
-\input{../lib/WApersons}% Some sections of the included files depend on this.
-
-
-\begin{document}
-\begin{center}\color{red}\huge
-This mock proposal is just an example for \texttt{euproposal.cls} it reflects the ICT
-template of May 2011
-\end{center}
-\begin{proposal}[site=jacu,jacuRM=36,
-  site=efo,efoRM=36,
-  site=bar,barRM=36,
-  site=baz,bazRM=36,
-  coordinator=miko,
-  acronym={iPoWr},
-  acrolong={\underline{I}ntelligent} {\underline{P}r\underline{o}sal} {\underline{Wr}iting},
-  title=\pn: \protect\pnlong,
-  callname = ICT Call 1,
-  callid = FP7-???-200?-?,
-  instrument= Small or Medium-Scale Focused Research Project (STREP), 
-  challengeid = 4,
-  challenge = ICT for EU Proposals,
-  objectiveid={ICT-2012.4.4}, 
-  objective = Technology-enhanced Documents,
-  outcomeid = b1,
-  outcome = {More time for Research, not Proposal writing},
-  coordinator=miko,
-  months=24,
-  compactht]
-\begin{abstract}
-  Writing grant proposals is a collaborative effort that requires the integration of
-  contributions from many individuals. The use of an ASCII-based format like {\LaTeX}
-  allows to coordinate the process via a source code control system like
-  {\textsc{Subversion}}, allowing the proposal writing team to concentrate on the contents
-  rather than the mechanics of wrangling with text fragments and revisions.
-\end{abstract}
-
-\tableofcontents
-
-\begin{todo}{from the proposal template}
-  Recommended length for the whole part B: 50--60 pages (including tables, references,
-  etc.)
-\end{todo}
-\include{quality}\newpage
-\include{implementation}\newpage
-\include{impact}\newpage
-\include{issues}
-\end{proposal}
-\end{document}
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: t
-%%% End: 
-
-% LocalWords:  efo efoRM baz bazRM miko acrolong ntelligent iting pn pnlong
-% LocalWords:  textsc newpage compactht
diff --git a/eu/examples/fetopenstrep/public.pdf b/eu/examples/fetopenstrep/public.pdf
deleted file mode 100644
index 2c9e43a..0000000
Binary files a/eu/examples/fetopenstrep/public.pdf and /dev/null differ
diff --git a/eu/examples/fetopenstrep/public.tex b/eu/examples/fetopenstrep/public.tex
deleted file mode 100644
index 00c95f1..0000000
--- a/eu/examples/fetopenstrep/public.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\newcommand{\classoptions}{,submit,public}
-\input{proposal}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
diff --git a/eu/examples/fetopenstrep/quality.tex b/eu/examples/fetopenstrep/quality.tex
deleted file mode 100644
index 430de6b..0000000
--- a/eu/examples/fetopenstrep/quality.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\chapter{Scientific and Technical Quality}\label{chap:quality}
-\begin{todo}{from the proposal template}
-  Maximum length for the whole of Section 1 –-- twenty pages, not including the tables in
-  Section 1.3
-\end{todo}
-
-\input{breakthrough}
-\input{novelty}
-\input{methodology}
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "propB"
-%%% End: 
-
diff --git a/eu/examples/fetopenstrep/submit.pdf b/eu/examples/fetopenstrep/submit.pdf
deleted file mode 100644
index 9fee253..0000000
Binary files a/eu/examples/fetopenstrep/submit.pdf and /dev/null differ
diff --git a/eu/examples/fetopenstrep/submit.tex b/eu/examples/fetopenstrep/submit.tex
deleted file mode 100644
index 5d92f93..0000000
--- a/eu/examples/fetopenstrep/submit.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\newcommand{\classoptions}{submit}
-\input{proposal}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
diff --git a/eu/examples/fetopenstrep/workplan.tex b/eu/examples/fetopenstrep/workplan.tex
deleted file mode 100644
index 664c223..0000000
--- a/eu/examples/fetopenstrep/workplan.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\begin{todo}{from the proposal template}
-\begin{enumerate}
-\item Describe the overall strategy of the work plan\ednote{Maximum length – one page}
-\item Show the timing of the different WPs and their components (Gantt chart or similar).
-\end{enumerate}
-\end{todo}
-\begin{figure}
-  \caption{Work package dependencies}
-  \label{fig:wp-deps}
-\end{figure}
-
-\ganttchart[draft,xscale=.45] 
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "propB"
-%%% End: 
-
-% LocalWords:  workplan.tex ednote wp-deps ganttchart xscale
diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf
index baf9bb1..0cb81e4 100644
Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ
diff --git a/eu/examples/strep/propB.tex b/eu/examples/strep/propB.tex
index 986826c..13afd61 100644
--- a/eu/examples/strep/propB.tex
+++ b/eu/examples/strep/propB.tex
@@ -4,8 +4,8 @@
 % - public.tex (like submit.tex, but no financials either) 
 \providecommand{\classoptions}{,keys} % to be overwritten in variants
 \documentclass[noworkareas,deliverables,gitinfo,propB\classoptions]{euproposal}
-%\usepackage[T1]{fontenc}
-%\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
 \addbibresource{../lib/dummy}
 \input{../lib/WApersons}% Some sections of the included files depend on this.
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e7c518f..57da62f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -76,13 +76,13 @@ ltds:
 	cp $(DTX.src) $(TDS.src) $(TDSDIR.src)
 	cp $(DTX.sty) $(DTX.cls) $(TDS.tex) $(TDSDIR.tex)
 	cp README $(DTX.pdf) $(EXAMPLE.tex) $(EXAMPLE.pdf) $(TDS.doc) $(TDSDIR.doc)
-	@for d in $(TDS.exdirs); do cp -R $(TDS.exdirs) $(TDSDIR.doc); done
+	@for d in $(TDS.exdirs); do cp -R $$d $(TDSDIR.doc); done
 
 lctan:
 	mkdir -p $(CTANDIR)
 	cp $(DTX.src) $(DTX.sty) $(DTX.cls) $(TDS.src) $(TDS.tex) $(CTANDIR)
 	cp README $(DTX.pdf) $(EXAMPLE.tex) $(EXAMPLE.pdf) $(TDS.doc) $(CTANDIR)
-	@for d in $(TDS.exdirs); do cp -R $(TDS.exdirs) $(CTANDIR); done
+	@for d in $(TDS.exdirs); do cp -R $$d $(CTANDIR); done
 
 # sometimes (when bibLaTeX changes) we have to rerun biber; use make -B biber
 biber: