diff --git a/gui/src/components/About.js b/gui/src/components/About.js
index c7ebcbbbfdd7651c59f62ee079f8be453623b6cb..cfdf0ce6e2bd0b27caa62b4ef79efd9f0a2a585e 100644
--- a/gui/src/components/About.js
+++ b/gui/src/components/About.js
@@ -38,7 +38,20 @@ class About extends React.Component {
     return (
       <div className={classes.root}>
         <Markdown>{`
-          ## The nomad**@FAIR** prototype
+          ## The nomad**@FAIRDI** *beta* test
+
+          **!Please read this, before you explore this new part of Nomad!**
+
+          ### About nomad@FAIRDI
+
+          After the conclusion of the origin [NOMAD-coe](http://nomad-coe.eu) project,
+          the newly founded NGO *FAIR Data Infrastructures* (FAIRDI) provides an
+          umbrella to continue operation and further development of the original Nomad
+          software. Therefore, we use the name *nomad@FAIRDI* to refer to the new
+          consolidated nomad data infrastructure.
+
+          As a first step, we refined the Nomad upload and data processing.
+
           This is a prototype, a concept, for a continuation of the
           [NOMAD-coe](http://nomad-coe.eu) project. It is an attempt to redesign
           the nomad software and infrastructure with the following goals in mind:
diff --git a/gui/src/components/ems/EMSEntryCards.js b/gui/src/components/ems/EMSEntryCards.js
index 55c90715b92667f1290339b427d215992b438b60..26395b2ffac7199564288ef17f91a9847c4800e8 100644
--- a/gui/src/components/ems/EMSEntryCards.js
+++ b/gui/src/components/ems/EMSEntryCards.js
@@ -26,8 +26,8 @@ class EMSEntryCards extends React.Component {
         <CardHeader title="Raw Data and Meta Data Files" />
         <CardContent classes={{root: classes.cardContent}}>
           <Markdown classes={{root: classes.description}}>{`
-            The data for this experiment was uploaded to [xenodo.org](https://xenodo.org).
-            Visit the xenodo entry to download the raw experiment data:
+            The data for this experiment was uploaded to [zenodo.org](https://zenodo.org).
+            Visit the zenodo entry to download the raw experiment data:
             [${data.repository_url}](${data.repository_url}).
 
             The meta data describing this experiment in its original format, can be
diff --git a/gui/src/components/uploads/Uploads.js b/gui/src/components/uploads/Uploads.js
index eefff8156ef306a1f95fb58b324b2ccc30591f1e..c40964942168bea89a5d1c87adbb3bb690adcb1a 100644
--- a/gui/src/components/uploads/Uploads.js
+++ b/gui/src/components/uploads/Uploads.js
@@ -258,8 +258,9 @@ class Uploads extends React.Component {
       <div className={classes.root}>
         <Agree message={agreement} cookie="agreedToUploadTerms">
           <Help cookie="uploadHelp" component={Markdown}>{`
-            To upload your own data, please put all relevant files in a
-            \`*.zip\` or \`*.tar.gz\` archive. We encourage you to add all code input and
+            To upload your own data, please put all relevant files of all the calculations
+            you want to upload into a single \`*.zip\` or \`*.tar.gz\` archive.
+            We encourage you to add all code input and
             output files, as well as any other auxiliary files that you might have created.
             You can put data from multiple calculations, using your preferred directory
             structure, into your archives. Drop your archive file(s) below.
@@ -272,6 +273,9 @@ class Uploads extends React.Component {
             for your data, and later publish the data. The *embargo* might last up to
             36 month before it becomes public automatically. During an *embargo*
             some meta-data will be available.
+
+            There is a limit of 32 GB per upload. Please upload multiple archives, if
+            you have more than 32 GB of data to upload.
           `}</Help>
 
           <Paper className={classes.dropzoneContainer}>
@@ -282,7 +286,7 @@ class Uploads extends React.Component {
               rejectClassName={classes.dropzoneReject}
               onDrop={this.onDrop.bind(this)}
             >
-              <p>drop files here</p>
+              <p>drop .tar.gz or .zip files here</p>
               <UploadIcon style={{fontSize: 36}}/>
             </Dropzone>
           </Paper>
@@ -290,7 +294,7 @@ class Uploads extends React.Component {
           <Help cookie="uploadCommandHelp">{`
             Alternatively, you can upload files via the following shell command.
             Replace \`<local_file>\` with your archive file. After executing the command,
-            return here and reload (e.g. press the reload button below).
+            return here and press the reload button below). The same 32 GB limit applies.
           `}</Help>
 
           <Markdown>{`
diff --git a/nomad/api/repo.py b/nomad/api/repo.py
index 59f0dcbc82ffde2f47b91c274d7b2ecc07ce4fe1..a6889dfc9c00a86bb1ba3bc3196af5acaef0728e 100644
--- a/nomad/api/repo.py
+++ b/nomad/api/repo.py
@@ -208,6 +208,9 @@ class RepoCalcsResource(Resource):
         else:
             abort(400, message='Invalid owner value. Valid values are all|user|staging, default is all')
 
+        with_provernance = not Q('term', **{'uploader.user_id': 1})
+        q = q & with_provernance if q is not None else with_provernance
+
         data = dict(**request.args)
         data.pop('owner', None)
         data.pop('scroll', None)
diff --git a/nomad/api/upload.py b/nomad/api/upload.py
index a93b953420a1390597e33f671fd923a4e6b76487..e0bcedaf541318c59cd91e6e173ba2d65631e19b 100644
--- a/nomad/api/upload.py
+++ b/nomad/api/upload.py
@@ -410,7 +410,7 @@ class UploadCommandResource(Resource):
     @login_really_required
     def get(self):
         """ Get url and example command for shell based uploads. """
-        upload_url = '%s/uploads' % config.api_url()
+        upload_url = '%s/uploads/' % config.api_url()
 
         upload_command = 'curl -X PUT -H "X-Token: %s" "%s" -F file=@<local_file>' % (
             g.user.get_auth_token().decode('utf-8'), upload_url)
diff --git a/nomad/parsing/__init__.py b/nomad/parsing/__init__.py
index 1f4fe6855cfc39dfdae9e031779ac917cd35fe1c..2fe39941ea14fe7f19d5df2f254550ea852dfa0e 100644
--- a/nomad/parsing/__init__.py
+++ b/nomad/parsing/__init__.py
@@ -384,7 +384,7 @@ parsers = [
         mainfile_contents_re=r'M O L C A S'
     ),
     MissingParser(
-        name='parser/molcas', code_name='MOLCAS', domain='DFT',
+        name='parser/onetep', code_name='ONETEP', domain='DFT',
         mainfile_contents_re=r'####### #     # ####### ####### ####### ######'
     ),
     # These are supposedly octopus files, but they do not look like octopus files at all