diff --git a/xml/dtd/common.xsd b/xml/dtd/common.xsd
index a72e9d7..c8654dd 100644
--- a/xml/dtd/common.xsd
+++ b/xml/dtd/common.xsd
@@ -116,7 +116,7 @@
       <xs:attribute name="lastrevisiondate" type="xs:date"/>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="rate">
     <xs:complexType>
       <xs:simpleContent>
@@ -159,12 +159,16 @@
   <xs:element name="planning">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="start" type="xs:date"/>
-        <xs:element name="end" type="xs:date"/>
+        <xs:element ref="start"/>
+        <xs:element ref="end"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="report_due" type="xs:string"/>
+  <xs:element name="report_due">
+    <xs:simpleType>
+      <xs:union memberTypes="xs:date xs:string"/>
+    </xs:simpleType>
+  </xs:element>
   <xs:element name="nature" type="xs:string"/>
   <xs:element name="type">
     <xs:simpleType>
@@ -175,7 +179,21 @@
       </xs:restriction>
     </xs:simpleType>
   </xs:element>
+
+  <xs:element name="start">
+    <xs:simpleType>
+      <xs:union memberTypes="xs:date xs:string"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="end">
+    <xs:simpleType>
+      <xs:union memberTypes="xs:date xs:string"/>
+    </xs:simpleType>
+  </xs:element>
   
+  
+
   <xs:element name="target_application" type="xs:string"/>
   <xs:element name="target_application_producer" type="xs:string"/>
 
diff --git a/xml/dtd/quickscope.xsd b/xml/dtd/quickscope.xsd
index 00ed0fe..cb8287c 100644
--- a/xml/dtd/quickscope.xsd
+++ b/xml/dtd/quickscope.xsd
@@ -55,7 +55,11 @@
     </xs:complexType>
   </xs:element>
   <xs:element name="days" type="xs:integer"/>
-  <xs:element name="delivery" type="xs:NCName"/>
+  <xs:element name="delivery">
+    <xs:simpleType>
+      <xs:union memberTypes="xs:date xs:string"/>
+    </xs:simpleType>
+  </xs:element>
   <xs:element name="codeaudit">
     <xs:complexType>
       <xs:attribute name="perform" use="required" type="xs:NCName"/>
diff --git a/xml/source/quickscope.xml b/xml/source/quickscope.xml
index 3343b92..17e9a70 100644
--- a/xml/source/quickscope.xml
+++ b/xml/source/quickscope.xml
@@ -17,12 +17,6 @@
     <!-- Required service -->
     <!-- Note: is only used when type is 'other', if offer_type is a specific type, service name will be taken from the localisation strings -->
     <requested_service>penetration testing services</requested_service>
-    <!-- Which targets will need to be tested?
-            (one <target> element for each piece of software/service/server address/location...), delete/add as necessary -->
-    <targets>
-      <target></target>
-      <target></target>
-    </targets>
   </meta>
   <!-- Do we need permission from third parties? Insert as many <third_party> elements as needed under this comment -->
   <!-- INSERT OPTIONAL THIRD PARTIES HERE -->
@@ -36,6 +30,12 @@
   </third_party> -->
   <!-- ___________________________________ -->
   <activityinfo>
+    <!-- Which targets will need to be tested?
+            (one <target> element for each piece of software/service/server address/location...), delete/add as necessary -->
+    <targets>
+      <target></target>
+      <target></target>
+    </targets>
     <!-- How long would you like the test to be? (in days) -->
     <days>0</days>
     <!-- How many persondays (if you don't know, try days * number of assigned pentesters) -->
@@ -45,10 +45,12 @@
     <!-- Testing type (Use one of the following values: crystal-box, black-box, grey-box) -->
     <type>crystal-box</type>
     <!-- Test planning (when would you like the test to be executed -->
-    <!-- Ideally something specific like 'December 7th - December 12th, 2015', but another description 'Beginning of December' is fine as well -->
-    <!-- do not start with a capital letter -->
-    <planning>TBD</planning>
+    <!-- dates should be in ISO format (YYY-MM-DD) -->
+    <!-- if unknown, write TBD -->
+    <planning><start>YYYY-MM-DD</start><end>TBD</end></planning>
     <!-- Pentest report delivery date (please allow at least 1 week between the end of the pentest and the report delivery date) -->
+    <!-- date should be in ISO format (YYY-MM-DD) -->
+    <!-- if unknown, write TBD -->
     <delivery>TBD</delivery>
     <!-- Do you need/want a code audit? (possible values: yes/no), only for pentest -->
     <codeaudit perform="yes"/>
diff --git a/xml/xslt/off2rep.xsl b/xml/xslt/off2rep.xsl
index 9f2a0b1..1b21b09 100644
--- a/xml/xslt/off2rep.xsl
+++ b/xml/xslt/off2rep.xsl
@@ -82,9 +82,9 @@
                 <title>Executive Summary</title>
                 <section id="introduction">
                     <title>Introduction</title>
-                    <p>...</p>
+                    <p>Between <p_startdate/> and <p_enddate/>, <company_long/> carried out a penetration test for <client_long/></p>
                     <p>This report contains our findings as well as detailed explanations of exactly
-                        how ROS performed the penetration test.</p>
+                        how <company_short/> performed the penetration test.</p>
                 </section>
                 <section id="scope">
                     <title>Scope of work</title>
diff --git a/xml/xslt/rep2off.xsl b/xml/xslt/rep2off.xsl
index 0e3e60a..cd8a533 100644
--- a/xml/xslt/rep2off.xsl
+++ b/xml/xslt/rep2off.xsl
@@ -84,23 +84,18 @@
                     <xsl:comment>duration of pentest, in persondays</xsl:comment>
                     <planning>
                         <start>
-                            <xsl:comment>date in ISO format: YYYY-MM-DD</xsl:comment>
+                            <xsl:comment>date in ISO format (YYYY-MM-DD) or TBD</xsl:comment>
                             <xsl:text>YYYY-MM-DD</xsl:text>
                         </start>
                         <end>
-                            <xsl:comment>date in ISO format: YYYY-MM-DD</xsl:comment>
+                            <xsl:comment>date in ISO format (YYYY-MM-DD) or TBD</xsl:comment>
                             <xsl:text>YYYY-MM-DD</xsl:text>
                         </end>
                     </planning>
                     <report_due>
-                        <xsl:choose>
-                            <xsl:when test="/*/activityinfo/report_due">
-                                <xsl:value-of select="/*/activityinfo/report_due"/>
-                            </xsl:when>
-                            <xsl:otherwise>TBD</xsl:otherwise>
-                        </xsl:choose>
+                        <xsl:comment>date in ISO format (YYYY-MM-DD) or TBD</xsl:comment>
+                            <xsl:text>YYYY-MM-DD</xsl:text>
                     </report_due>
-                    <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment>
                     <nature>
                         <xsl:choose>
                             <xsl:when test="/*/activityinfo/nature">