diff --git a/README.md b/README.md
index 8093a47..45d1857 100644
--- a/README.md
+++ b/README.md
@@ -1,103 +1,103 @@
 # Codemeta Generator
 
 This repository contains a (client-side) web application to generate
 CodeMeta documents (aka. `codemeta.json`).
 
 The [CodeMeta initiative](https://github.com/codemeta/codemeta) is a Free and Open Source academic collaboration
 creating a minimal metadata schema for research software and code.
 
 The academic community recommands on adding a codemeta.json file in
 the root directory of your repository.
 
 With this linked data metadata file, you can easily declare the authorship,
 include contextual information and link to other research outputs (publications,
 data, etc.).
 
 Also, the `codemeta.json` file in your source code is indexed in the
 Software Heritage (SWH) archive, which will improve findability in searches.
 
 ### References
 
 - [SWH guidelines](https://www.softwareheritage.org/save-and-reference-research-software/) for research software.
 
 - [SWH blog post](https://www.softwareheritage.org/2019/05/28/mining-software-metadata-for-80-m-projects-and-even-more/) about metadata indexation.
 - [Dan S. Katz's blog post](https://danielskatzblog.wordpress.com/2017/09/25/software-heritage-and-repository-metadata-a-software-citation-solution/) about including
  metadata in your repository.
 - FORCE11's Software Citation Implementation WG [repository](https://github.com/force11/force11-sciwg)
 - RDA & FORCE11's joint Software Source Code Identification WG
    [repository](https://github.com/force11/force11-rda-scidwg)
 
 ## Specifications
 
 ### Use case
 
 1. create a complete codemeta.json file from scratch
 2. aggregate existing information and add complementary information to
 a codemeta.json file
 
 ### Functionalities
 
 - helpers while completing the form, for example a reference list of spdx
   licenses
 - a validation mechanism after submission
 - the possibility to use all the codeMeta terms and schema.org terms
 - accessible from multiple platforms (web browsers or OS)
 - (extra) the possibility to correct the output after validation as part
   of the creation process
 
 This tool was initially prepared for the [FORCE19 Hackathon](https://github.com/force11/force11-rda-scidwg/tree/master/hackathon/FORCE2019).
 
+**NB:** codemeta v2.0 is generated by default, but v3.0 (v2.0 compatible) can be generated via a dedicated button.
 
 ## Code contributions.
 
 This section only applies to developers who want to contribute to the Codemeta Generator.
 If you only want to use it, you can use
 [the hosted version](https://codemeta.github.io/codemeta-generator/) instead.
 
 ### Code guidelines
 
 This application is designed to work on popular modern browsers (Firefox,
 Chromium/Google Chrome, Edge, Safari). Check [Caniuse](https://caniuse.com/)
 for availability of features for these browsers.
 
 To keep the architecture simple, we serve javascript files directly to
-browsers, without a compiler or transpiler; and do not use third-party
-dependencies for now.
+browsers, without a compiler or transpiler.
 
 ### Running local changes
 
 To run Codemeta Generator, you just need an HTTP server serving the
 files (nginx, apache2, etc.).
 
 The simplest way is probably to use Python's HTTP server:
 
 ```
 git clone https://github.com/codemeta/codemeta-generator
 cd codemeta-generator
 python3 -m http.server
 ```
 
 then open [http://localhost:8000/](http://localhost:8000/) in your web browser.
 
 ### Automatic testing
 
 In addition to manual testing, we have automated tests to check for bugs
 quickly, using [Cypress](https://www.cypress.io/).
 
 To run them, first install Cypress:
 
 ```
 sudo apt install npm  # or the equivalent on your system
 npx cypress@9.7.0 install
 ```
 
 Then, run the tests:
 
 ```
 npx cypress@9.7.0 run
 ```
 
 
 ## Contributed by
 
 ![Image description](https://annex.softwareheritage.org/public/logo/software-heritage-logo-title-motto.svg)
diff --git a/index.html b/index.html
index 3af9815..cda6dc8 100644
--- a/index.html
+++ b/index.html
@@ -1,394 +1,394 @@
 <!doctype html>
 <!--
 Copyright (C) 2019-2020  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 -->
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <title>CodeMeta generator</title>
     <script src="./js/utils.js"></script>
     <script src="./js/fields_data.js"></script>
     <script src="./js/dynamic_form.js"></script>
     <script src="./js/codemeta_generation.js"></script>
     <script src="./js/validation/primitives.js"></script>
     <script src="./js/validation/things.js"></script>
     <script src="./js/validation/index.js"></script>
     <link rel="stylesheet" type="text/css" href="./main.css">
     <link rel="stylesheet" type="text/css" href="./codemeta.css">
 </head>
 <body>
   <header>
-    <h1>CodeMeta generator v3.0</h1><!-- Generate codemeta v2.0 by default for now, allow v3.0 generation by clicking -->
+    <h1>CodeMeta generator v3.0</h1>
   </header>
 
   <main>
 
     <p>Most fields are optional. Mandatory fields will be highlighted when generating Codemeta.</p>
 
     <noscript>
         <p id="noscriptError">
             This application requires Javascript to show dynamic fields in the form,
             and generate a JSON file; but your browser does not support Javascript.
             If you cannot use a browser with Javascript support, you can try
             <a href="https://codemeta.github.io/tools/">one of the other available tools</a>
             or write the codemeta.json file directly.
         </p>
     </noscript>
 
     <form id="inputForm">
         <fieldset id="fieldsetSoftwareItself" class="leafFieldset">
             <legend>The software itself</legend>
 
             <p title="The name of the software">
                 <label for="name">Name</label>
                 <input type="text" name="name" id="name" aria-describedby="name_descr"
                     placeholder="My Software" required="required" />
 
                 <span class="field-description" id="name_descr">the software title</span>
             </p>
 
             <p title="a brief description of the software">
                 <label for="description">Description</label>
                 <textarea rows="4" cols="50"
                     name="description" id="description"
                     placeholder="My Software computes ephemerides and orbit propagation. It has been developed from early ´80." ></textarea>
             </p>
 
 
             <p title="The date on which the software was created.">
                 <label for="dateCreated">Creation date</label>
                 <input type="text" name="dateCreated" id="dateCreated"
                     placeholder="YYYY-MM-DD" pattern="\d{4}-\d{2}-\d{2}" />
             </p>
 
             <p title="Date of first publication.">
                 <label for="datePublished">First release date</label>
                 <input type="text" name="datePublished" id="datePublished"
                     placeholder="YYYY-MM-DD" pattern="\d{4}-\d{2}-\d{2}" />
             </p>
 
             <p>
                 <label for="license">License(s)</label>
                 <input list="licenses" name="license" id="license"
                     aria-describedby="licenses_descr"> <!-- TODO: insert placeholder -->
 
                 <datalist id="licenses">
                 </datalist>
                 <!-- This datalist is be filled automatically -->
 
                 <br />
                 <span class="field-description" id="licenses_descr">from <a href="https://spdx.org/license-list">SPDX licence list</a></span>
 
                 <div id="selected-licenses">
                     <!-- This div is to be filled as the user selects licenses -->
                 </div>
             </p>
         </fieldset>
 
         <fieldset id="fieldsetDiscoverabilityAndCitation" class="leafFieldset">
             <legend>Discoverability and citation</legend>
 
             <p title="Unique identifier">
                 <label for="identifier">Unique identifier</label>
                 <input type="text" name="identifier" id="identifier"
                     placeholder="10.151.xxxxx" aria-describedby="identifier_descr" />
 
                 <br />
                 <span class="field-description" id="identifier_descr">
                     such as ISBNs, GTIN codes, UUIDs etc..  <a href="http://schema.org/identifier">http://schema.org/identifier</a>
                 </span>
             </p>
             <!-- TODO:define better
 
             I looked at the schema.org definition of identifier (https://schema.org/identifier),
             it can be text, url or PropertyValue.
             Used as follows in data representation with microdata:
 
             <div property="identifier" typeof="PropertyValue">
             <span property="propertyID">DOI</span>:
             <span property="value">10.151.xxxxx</span>
             </div>
             we can use that with identifier-type and identifier-value to have a clearer idea
             of what needs to be in the input.
 
             -->
 
             <p title="Type of the software application">
                 <label for="applicationCategory">Application category</label>
                 <input type="text" name="applicationCategory" id="applicationCategory"
                     placeholder="Astronomy"  />
             </p>
 
             <p title="Comma-separated list of keywords">
                 <label for="keywords">Keywords</label>
                 <input type="text" name="keywords" id="keywords"
                     placeholder="ephemerides, orbit, astronomy"  />
             </p>
 
             <p title="Funding / grant">
                 <label for="funding">Funding</label>
                 <input type="text" name="funding" id="funding" aria-describedby="funding_descr"
                     placeholder="PRA_2018_73"/>
 
                 <br />
                 <span class="field-description" id="funding_descr">grant funding software development</span>
             </p>
 
             <p title="Funding / organization">
                 <label for="funder">Funder</label>
                 <input type="text" name="funder" id="funder" aria-describedby="funder_descr"
                     placeholder="Università di Pisa"/>
 
                 <br />
                 <span class="field-description" id="funder_descr">organization funding software development</span>
             </p>
 
             Authors and contributors can be added below
         </fieldset>
 
         <fieldset id="fieldsetDevelopmentCommunity" class="leafFieldset">
             <legend>Development community / tools</legend>
 
             <p title="Link to the repository where the un-compiled, human readable code and related code is located (SVN, Git, GitHub, CodePlex, institutional GitLab instance, etc.).">
                 <label for="codeRepository">Code repository</label>
                 <input type="URL" name="codeRepository" id="codeRepository"
                     placeholder="git+https://github.com/You/RepoName.git" />
             </p>
 
             <p title="Link to continuous integration service (Travis-CI, Gitlab CI, etc.).">
                 <label for="contIntegration">Continuous integration</label>
                 <input type="URL" name="contIntegration" id="contIntegration"
                     placeholder="https://travis-ci.org/You/RepoName" />
             </p>
 
             <p title="Link to a place for users/developpers to report and manage bugs (JIRA, GitHub issues, etc.).">
                 <label for="issueTracker">Issue tracker</label>
                 <input type="URL" name="issueTracker" id="issueTracker"
                     placeholder="https://github.com/You/RepoName/issues" />
             </p>
 
             <p title="Related document, software, tools">
                 <label for="relatedLink">Related links</label>
                 <br />
                 <textarea rows="4" cols="50"
                     name="relatedLink" id="relatedLink"></textarea>
         </fieldset>
 
         <fieldset id="fieldsetRuntime" class="leafFieldset">
             <legend>Run-time environment</legend>
 
             <p title="Programming Languages, separated by commas">
                 <label for="programmingLanguage">Programming Language</label>
                 <input type="text" name="programmingLanguage" id="programmingLanguage"
                     placeholder="C#, Java, Python 3"  />
             </p>
 
             <p title="Runtime Platforms, separated by commas">
                 <label for="runtimePlatform">Runtime Platform</label>
                 <input type="text" name="runtimePlatform" id="runtimePlatform"
                     placeholder=".NET, JVM" />
             </p>
 
             <p title="Operating Systems, separated by commas">
                 <label for="operatingSystem">Operating System</label>
                 <input type="text" name="operatingSystem" id="operatingSystem"
                     placeholder="Android 1.6, Linux, Windows, macOS" />
             </p>
 
             <p title="Required software to run/use this one.">
                 <label for="softwareRequirements">Other software requirements</label>
                 <br />
                 <textarea rows="4" cols="50"
                     name="softwareRequirements" id="softwareRequirements"
                     placeholder=
 "Python 3.4
 https://github.com/psf/requests"></textarea>
         </fieldset>
 
         <fieldset id="fieldsetCurrentVersion" class="leafFieldset">
             <legend>Current version of the software</legend>
 
             <p title="Version number of the software">
                 <label for="version">Version number</label>
                 <input type="text" name="version" id="version"
                     placeholder="1.0.0" />
             </p>
 
             <p title="The date on which the software was most recently modified.">
                 <label for="dateModified">Release date</label>
                 <input type="text" name="dateModified" id="dateModified"
                     placeholder="YYYY-MM-DD" pattern="\d{4}-\d{2}-\d{2}" />
             </p>
 
             <p title="Download link">
                 <label for="downloadUrl">Download URL</label>
                 <input type="URL" name="downloadUrl" id="downloadUrl"
                     placeholder="https://example.org/MySoftware.tar.gz" />
             </p>
 
             <p title="a brief description of the software">
                 <label for="releaseNotes">Release notes</label>
                 <br />
                 <textarea rows="4" cols="50"
                     name="releaseNotes" id="releaseNotes"
                     placeholder=
 "Change log: this and that;
 Bugfixes: that and this." ></textarea>
             </p>
 
 <!--TODO: referencePublication as ScholarlyArticle array -->
 
         </fieldset>
 
         <fieldset id="review_container" class="leafFieldset">
             <legend>Editorial review</legend>
 
             <p title="Scholarly article describing this software">
                 <label for="referencePublication">Reference Publication</label>
                 <input type="URL" name="referencePublication" id="referencePublication"
                     placeholder="https://doi.org/10.1000/xyz123" />
             </p>
 
             <p title="Part or facet of the object being review ">
                 <label for="reviewAspect">Review aspect</label>
                 <input type="text" name="reviewAspect" id="reviewAspect"
                     placeholder="Object facet" />
             </p>
 
           <p title="The actual body of the review ">
                 <label for="reviewBody">Review body</label>
                 <textarea rows="4" cols="50"
                     name="reviewBody" id="reviewBody"
                     placeholder="Review about my software." ></textarea>
             </p>
         </fieldset>
 
         <fieldset id="fieldsetAdditionalInfo" class="leafFieldset">
             <legend>Additional Info</legend>
 
             <p title="Development Status">
             <label for="developmentStatus">Development Status</label>
                 <datalist id="developmentStatuses">
                         <option value="concept">
                         <option value="wip">
                         <option value="suspended">
                         <option value="abandoned">
                         <option value="active">
                         <option value="inactive">
                         <option value="unsupported">
                         <option value="moved">
                 </datalist>
                 <input list="developmentStatuses" id="developmentStatus" aria-describedby="developmentStatuses_descr"
                 pattern="concept|wip|suspended|abandoned|active|inactive|unsupported|moved">
 
                 <br />
                 <span class="field-description" id="developmentStatuses_descr">
                     see <a href="http://www.repostatus.org">www.repostatus.org</a> for details
                 </span>
             </p>
 
             <p title="Source Code of">
                 <label for="isSourceCodeOf">Is Source Code of</label>
                 <input type="text" name="isSourceCodeOf" id="isSourceCodeOf"
                     placeholder="Bigger Application" />
             </p>
 
             <p title="Part of">
                 <label for="isPartOf">Is part of</label>
                 <input type="URL" name="isPartOf" id="isPartOf"
                     placeholder="http://The.Bigger.Framework.org"  />
             </p>
         </fieldset>
 
         <div class="dynamicFields">
             <fieldset class="persons" id="author_container">
                 <legend>Authors</legend>
 
                 <input type="hidden" id="author_nb" value="0" />
                 <div id="addRemoveAuthor">
                     <input type="button" id="author_add" value="Add one"
                         onclick="addPerson('author', 'Author');" />
                     <input type="button" id="author_remove" value="Remove last"
                         onclick="removePerson('author');" />
                 </div>
             </fieldset>
 
             <fieldset class="persons" id="contributor_container">
                 <legend>Contributors</legend>
 
                 <p>Order of contributors does not matter.</p>
 
                 <input type="hidden" id="contributor_nb" value="0" />
                 <div id="addRemoveContributor">
                     <input type="button" id="contributor_add" value="Add one"
                         onclick="addPerson('contributor', 'Contributor');" />
                     <input type="button" id="contributor_remove" value="Remove last"
                         onclick="removePerson('contributor');" />
                 </div>
             </fieldset>
         </div>
 
     </form>
     <form>
       <input type="button" id="generateCodemetaV3" value="Generate codemeta.json v3.0" disabled
              title="Creates a codemeta.json v3.0 file below, from the information provided above." />
       <input type="button" id="generateCodemetaV2" value="Generate codemeta.json v2.0" disabled
             title="Creates a codemeta.json v2.0 file below, from the information provided above." />
         <input type="button" id="resetForm" value="Reset form"
             title="Erases all fields." />
         <input type="button" id="validateCodemeta" value="Validate codemeta.json" disabled
             title="Checks the codemeta.json file below is valid, and displays errors." />
         <input type="button" id="importCodemeta" value="Import codemeta.json" disabled
             title="Fills the fields above based on the codemeta.json file below." />
     </form>
 
     <p id="errorMessage">
     </p>
     <p>codemeta.json:</p>
     <pre contentEditable="true" id="codemetaText"></pre>
   </main>
 
   <footer>
     <p style="text-align:center;">
         Do you want to improve this tool ?
         Check out the
         <a href="https://github.com/codemeta/codemeta-generator">
             CodeMeta-generator repository</a>
         <br />
         Join the
         <a href="https://github.com/codemeta/codemeta">CodeMeta community</a>
         discussion
         <br />
         The CodeMeta vocabulary -
         <a href="https://doi.org/10.5063/schema/codemeta-2.0">v2.0</a>
         -
         <a href="https://w3id.org/codemeta/3.0">v3.0</a>
     </p>
 
     <h2 style="text-align:right;">Contributed by</h2>
     <p style="text-align:right;">
         <a href="https://www.softwareheritage.org/save-and-reference-research-software/">
             <img alt="Software Heritage" src="https://annex.softwareheritage.org/public/logo/software-heritage-logo-title-motto.svg"
                 width="300">
         </a>
     </p>
   </footer>
 
   <script src="./js/libs/jsonld/jsonld.min.js"></script>
   <script>
     Promise.all([loadSpdxData(), loadContextData()]).then(results => {
       const [licenses, contexts] = results;
       SPDX_LICENSES = licenses;
       SPDX_LICENSE_IDS = licenses.map(license => license['licenseId']);
 
       initJsonldLoader(contexts);
       initFields();
       initCallbacks();
       loadStateFromStorage();
     });
   </script>
 </body>
 </html>