addressed most issues with the validation build

Author: ccAN114

input/esm-edr.xml

@@ -157,8 +157,7 @@ and so it is recommended that the intro text and associated table heading be upd
         its Host Agent (left) over an untrusted network. <h:p/> 
 
 	The requirements for the Host Agent are not covered in this PP-Module, however it is expected that an ESM 
-	system will evaluate against a PP-Configuration that includes both the EDR PP-Module  and the <cite
-        linkend="bibHAGT"/> PP-Module. <figure
+	system will evaluate against a PP-Configuration that includes both the EDR PP-Module  and the <xref g="bibHAGT"/> PP-Module. <figure
           entity="images/edr_overview.png" title="EDR and Host Agent Communications" id="toe_overview"/>
       </section>
       <section title="TOE Platform" id="TOEplatform"> The TOE platform, which consists of the OS or 
@@ -223,7 +222,7 @@ and so it is recommended that the intro text and associated table heading be upd
         </cc-pkg-claim>
   </CClaimsInfo></section>
 
-  <section title="Security Problem Description" id="spd"> The security problem is described in terms
+  <section title="Security Problem Definition" id="spd"> The security problem is described in terms
     of the threats that the EDR is expected to address, assumptions about the
     OE, and any organizational security policies that the EDR
     is expected to enforce.  These extend any threats, assumptions, and organizational security policies defined by the Base-PP.
@@ -285,6 +284,7 @@ and so it is recommended that the intro text and associated table heading be upd
     </section>
     <section title="Organizational Security Policies" id="OSPs">
       This PP-Module defines no additional organizational security policies beyond those defined in the Base-PP.
+      <OSPs/>
     </section>
   </section>
 
@@ -308,9 +308,7 @@ and so it is recommended that the intro text and associated table heading be upd
 
   <section title="Security Requirements" id="req">
 
-    <base-pp product="application" version="2.0" name="Application Software" short="App" plural="Application Software"
-      url="https://www.niap-ccevs.org/Profile/Info.cfm?PPID=429&amp;id=429"
-      xmlurl="https://github.com/commoncriteria/application/raw/4281d949ae0f570ac57de52f4b0e54c013aec022/input/application.xml">
+    <base-pp id="AppPP" name="Application Software" product="Application" short="App" version="2.0" >
       <sec-func-req-dir>
         In a PP-Configuration that includes <xref g="bibAppPP"/>, the TOE is expected to rely on some of the security functions implemented by the application as a whole and evaluated against the Base-PP.
 The SFRs listed in this section are defined in the Base-PP and relevant to the secure operation of the EDR.