diff --git a/app/assets/stylesheets/scss/_buttons.scss b/app/assets/stylesheets/scss/_buttons.scss
index c8613a1b49..0c0b37b30e 100644
--- a/app/assets/stylesheets/scss/_buttons.scss
+++ b/app/assets/stylesheets/scss/_buttons.scss
@@ -100,7 +100,12 @@ input[type=file]::file-selector-button {
   @extend %o-button__link-style;
   padding: 5px 0;
   color: $dark-blue;
-  font-size: 0.9em;
+  font-size: 0.98rem;
+}
+
+.o-button__plain-textlink {
+  @extend %o-button__link-style;
+  color: $dark-blue;
 }
 
 .o-button__plain-text6 {
diff --git a/app/assets/stylesheets/scss/_drop.scss b/app/assets/stylesheets/scss/_drop.scss
index dd7fb9e806..5c2117dedd 100644
--- a/app/assets/stylesheets/scss/_drop.scss
+++ b/app/assets/stylesheets/scss/_drop.scss
@@ -25,9 +25,12 @@
 .dd-list-item {
 	list-style: "";
 	margin: 1rem auto;
-  padding: 1rem;		
+  padding: 1rem;
 	background-color: $lightest-blue;
-  text-align: left;
+  display: flex;
+  align-items: flex-start;
+  flex-wrap: wrap;
+  gap: 1.5ch;
 
   &.dragon-inactive {
   }
@@ -36,7 +39,6 @@
 	  @extend %o-button__link-style;
 	  cursor: ns-resize;
 	  float: left;
-	  margin-right: 1.5ch;
 	  margin-top: 28px;
 	  &:before {
 		  font-family: 'Font Awesome 6 Free';
diff --git a/app/assets/stylesheets/scss/_input.scss b/app/assets/stylesheets/scss/_input.scss
index 80229daec1..284c8cc93f 100644
--- a/app/assets/stylesheets/scss/_input.scss
+++ b/app/assets/stylesheets/scss/_input.scss
@@ -15,13 +15,40 @@ input {
 	flex-wrap: wrap;
 	column-gap: 2ch;
 	row-gap: 1ch;
+
+	&.spaced {
+		justify-content: space-between;
+  	align-items: baseline;
+  }
 }
 
 .input-label {
 	color: $dark-navy;
 }
 
-label.optional:after, label span.details {
+.input-example, [id$='-ex'] {
+	font-size: .98rem;
+	color: $medium-gray;
+	margin-top: .35ch;
+	i:not(.fas, .far) {
+		 &:before {
+			font-style: normal;
+			display: inline-block;
+			content: 'e.g.';
+			color: $dark-gray;
+			margin-right: .5ch;
+		}
+		&.hint:before {
+			content: 'Hint:';
+		}
+		&.ie:before {
+			content: 'i.e.'
+		}
+	}
+}
+
+label.optional:after,
+label span.details {
 	display: inline-block;
 	font-size: .98rem;
 	font-weight: normal;
diff --git a/app/assets/stylesheets/scss/_keywords.scss b/app/assets/stylesheets/scss/_keywords.scss
index 71acec6f1e..5f967abd03 100644
--- a/app/assets/stylesheets/scss/_keywords.scss
+++ b/app/assets/stylesheets/scss/_keywords.scss
@@ -37,7 +37,9 @@
 .c-keywords__keyword-remove {
 	border: none;
 	background-color: $medium-green;
+	border: thin solid $light-green;
 	color: white;
+	font-size: .98rem;
 	line-height: 0;
 	&:hover, &:active, &:focus {
 		background-color: $dark-blue;
diff --git a/app/assets/stylesheets/scss/_steps.scss b/app/assets/stylesheets/scss/_steps.scss
index c617fec30c..ce01eb2b8a 100644
--- a/app/assets/stylesheets/scss/_steps.scss
+++ b/app/assets/stylesheets/scss/_steps.scss
@@ -9,6 +9,10 @@
     flex-direction: column;
     align-items: center;
     flex: 1;
+    cursor: pointer;
+    &:hover .step-name {
+      text-decoration: underline;
+    }
 
     &::after {
       position: absolute;
diff --git a/app/assets/stylesheets/scss/_submission-help.scss b/app/assets/stylesheets/scss/_submission-help.scss
index 60fd359b1c..2bc8dcf70b 100644
--- a/app/assets/stylesheets/scss/_submission-help.scss
+++ b/app/assets/stylesheets/scss/_submission-help.scss
@@ -1,3 +1,40 @@
+#submission-help {
+  //position: sticky;
+  //bottom: 0;
+  //box-shadow: $lightest-green 0px -4px 4px -6px;
+  border-top: thick solid $lightest-green;
+  background-color: white;
+  padding: 2rem;
+  padding-left: 30px;
+  width: 100%;
+  display: flex;
+  gap: 2ch;
+  align-items: flex-start;
+  justify-content: space-between;
+  flex-direction: row-reverse; 
+
+  #submission-help-text {
+    font-size: 1rem;
+    *:first-child {
+      margin-top: 0;
+    }
+    *:last-child {
+      margin-top: 0;
+    }
+  }
+
+  @media (max-width: 811px){
+    flex-direction: column-reverse;
+    *:first-child {
+      margin-left: auto;
+    }
+  }
+
+  button {
+    white-space: nowrap;
+  }
+}
+
 #infographic {
   margin: 2ch auto;
   display: grid;
diff --git a/app/assets/stylesheets/scss/_submission.scss b/app/assets/stylesheets/scss/_submission.scss
index 9bca27d5c4..c946e756a0 100644
--- a/app/assets/stylesheets/scss/_submission.scss
+++ b/app/assets/stylesheets/scss/_submission.scss
@@ -503,45 +503,22 @@ dialog#submission-step[open] {
   h1 {
     margin-bottom: 0;
   }
-  & + h2 {
+  & + h2, & + div > h2:first-child {
     margin-top: 1.1rem;
   }
 }
 
-#submission-help {
-  //position: sticky;
-  //bottom: 0;
-  //box-shadow: $lightest-green 0px -4px 4px -6px;
-  border-top: thick solid $lightest-green;
-  background-color: white;
-  padding: 2rem;
-  padding-left: 30px;
-  width: 100%;
+.drag-instruct {
+  font-size: .98rem;
   display: flex;
+  align-items: baseline;
   gap: 2ch;
-  align-items: flex-start;
-  justify-content: space-between;
-  flex-direction: row-reverse; 
-
-  #submission-help-text {
-    font-size: 1rem;
-    *:first-child {
-      margin-top: 0;
-    }
-    *:last-child {
-      margin-top: 0;
-    }
-  }
-
-  @media (max-width: 811px){
-    flex-direction: column-reverse;
-    *:first-child {
-      margin-left: auto;
-    }
+  flex-wrap: wrap;
+  i {
+    margin: 0 .5ch;
   }
-
-  button {
-    white-space: nowrap;
+  & > * {
+    margin-bottom: 0;
   }
 }
 
@@ -571,52 +548,95 @@ dialog#submission-step[open] {
   flex-wrap: wrap;
   column-gap: 1.5ch;
   row-gap: 1ch;
+  flex: 1;
 
-  & > span {
-    display: block;
-    align-self: start;
-  }
-
-  .remove-record {
+  .remove-record, & + .remove-record {
     @extend %o-button__link-style;
     margin-top: 28px;
   }
 }
 
+%author-form-button {
+  color: $dark-blue;
+  background-color: white;
+  border: thin solid $medium-blue;
+  padding: 2px 5px;
+  &:hover, &:active, &:focus {
+    background-color: $dark-blue;
+    color: white;
+  }
+}
+
 .author-form > div {
-  flex-basis: 25%;
-  max-width: calc(25% - 2.2ch);
+  flex-basis: calc(33% - 1ch);
+  flex-shrink: 1;
+  flex-grow: 0;
+  max-width: 100%;
+  min-width: 165px;
   * {
     max-width: 100%;
     text-overflow: ellipsis;
   }
+  &.affiliation-input {
+    flex: 1;
+    min-width: 200px;
+
+    .input-line {
+      align-items: baseline;
+      gap: 1ch;
+      flex-wrap: nowrap;
+      button {
+        @extend %author-form-button;
+        line-height: 0;
+        font-size: .9rem;
+      }
+    }
+
+    & + span {
+      display: block;
+      align-self: start;
+      button {
+        @extend %author-form-button;
+        margin-top: 28px;
+        font-size: .98rem;
+        padding-bottom: 0;
+      }
+    }
+  }
   @media (max-width: $screen-lg-min) {
-    flex-basis: 50%;
-    max-width: calc(50% - 2.2ch);
+    flex-basis: calc(50% - 1ch);
   }
-  @media (max-width: 600px) {
+  @media (max-width: 520px) {
     flex-basis: 100%;
-    max-width: 100%;
+  }
+}
+
+.open .author-form > div {
+  @media (max-width: 740px) {
+    flex-basis: 100%;
+  }
+}
+
+.auth-buttons {
+  display: flex;
+  flex-direction: row-reverse;
+  align-items: center;
+
+  i {
+    transform: rotate(75deg);
+    color: $dark-gray;
   }
 }
 
 .funder-form {
   padding-bottom: 1ch;
   & > div {
-    flex-basis: 33%;
-    max-width: calc(33% - 2.2ch);
+    flex-basis: 25%;
+    flex: 1;
     * {
       max-width: 100%;
       text-overflow: ellipsis;
     }
-    @media (max-width: 800px) {
-      flex-basis: 50%;
-      max-width: calc(50% - 2.2ch);
-    }
-    @media (max-width: 600px) {
-      flex-basis: 100%;
-      max-width: 100%;
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/scss/_upload-table.scss b/app/assets/stylesheets/scss/_upload-table.scss
index ce9cfc9dff..f6c82c7a4c 100644
--- a/app/assets/stylesheets/scss/_upload-table.scss
+++ b/app/assets/stylesheets/scss/_upload-table.scss
@@ -16,10 +16,11 @@
 
 .c-uploadtable {
   min-width: 100%;
+  font-size: 1rem;
 
   th,
   td {
-    padding: $spacing-sm;
+    padding: .75rem;
     border: thin solid #888;
     text-align: left;
   }
diff --git a/app/assets/stylesheets/scss/_variables.scss b/app/assets/stylesheets/scss/_variables.scss
index 922961ded0..bd1cfbd523 100644
--- a/app/assets/stylesheets/scss/_variables.scss
+++ b/app/assets/stylesheets/scss/_variables.scss
@@ -15,6 +15,7 @@ $light-blue: rgb(55, 150, 196);
 $lighter-blue: lighten($light-blue, 25%);
 $lightest-blue: lighten($light-blue, 44%);
 $dark-gray: rgb(78, 80, 80);
+$medium-gray: #767676;
 $light-gray: rgb(157, 159, 162);
 $lighter-gray: rgb(211, 211, 211);
 $lightest-gray: rgb(235, 235, 235);
diff --git a/app/controllers/stash_datacite/authors_controller.rb b/app/controllers/stash_datacite/authors_controller.rb
index d8a4952e9b..0f931f93e3 100644
--- a/app/controllers/stash_datacite/authors_controller.rb
+++ b/app/controllers/stash_datacite/authors_controller.rb
@@ -16,7 +16,6 @@ def new
     def create
       respond_to do |format|
         @author = StashEngine::Author.create(author_params)
-        process_affiliation unless params[:affiliation].nil?
         @author.reload
         format.js
         format.json { render json: @author.as_json(include: :affiliations) }
@@ -27,7 +26,7 @@ def create
     def update
       respond_to do |format|
         @author.update(author_params)
-        process_affiliation
+        process_affiliations
         format.js { render template: 'stash_datacite/shared/update.js.erb' }
         format.json { render json: @author.as_json(include: :affiliations) }
       end
@@ -75,29 +74,38 @@ def set_author
 
     # Only allow a trusted parameter "white list" through.
     def author_params
-      params.require(:author).permit(:id, :author_first_name, :author_last_name, :author_middle_name,
-                                     :author_email, :resource_id, :author_orcid, :author_order,
+      params.require(:author).permit(:id, :author_first_name, :author_last_name, :author_org_name,
+                                     :author_email, :resource_id, :author_orcid, :author_order, :corresp,
                                      affiliation: %i[id ror_id long_name])
     end
 
+    def aff_params
+      params.require(:author).permit(:id, :author_first_name, :author_last_name, :author_org_name,
+                                     :author_email, :resource_id, :author_orcid, :author_order, :corresp,
+                                     affiliations: %i[id ror_id long_name])
+    end
+
     def check_for_orcid(author)
       author&.author_orcid ? true : false
     end
 
     # find correct affiliation based on long_name and ror_id and set it, create one if needed.
-    def process_affiliation
+    def process_affiliations
       return nil unless @author.present?
 
-      args = author_params
-      if args['affiliation']['long_name'].blank?
-        @author.affiliations.destroy_all
-        return
+      @author.affiliations.destroy_all
+      args = aff_params
+      affs = args['affiliations']&.reject { |a| a['long_name'].blank? }
+      affs.each do |aff|
+        process_affiliation(aff['long_name'], aff['ror_id'])
       end
+    end
+
+    def process_affiliation(name, ror_val)
+      return nil unless @author.present?
 
       # find a matching pre-existing affiliation
       affil = nil
-      name = args['affiliation']['long_name']
-      ror_val = args['affiliation']['ror_id']
       if ror_val.present?
         # - find by ror_id if avaialable
         affil = StashDatacite::Affiliation.where(ror_id: ror_val).first
@@ -115,10 +123,9 @@ def process_affiliation
                   StashDatacite::Affiliation.create(long_name: name.to_s, ror_id: nil)
                 end
       end
-      return if @author.affiliation == affil
+      return if @author.affiliations.pluck(:ror_id).include?(affil.ror_id)
 
       @author.affiliation = affil
-      @author.save
     end
 
     def check_reorder_valid
diff --git a/app/controllers/stash_engine/resources_controller.rb b/app/controllers/stash_engine/resources_controller.rb
index a500fbb9b6..f096cc9628 100644
--- a/app/controllers/stash_engine/resources_controller.rb
+++ b/app/controllers/stash_engine/resources_controller.rb
@@ -175,20 +175,20 @@ def display_collection
     end
 
     def dupe_check
-      dupes = nil
+      dupes = []
       if @resource.title && @resource.title.length > 3
         other_submissions = params.key?(:admin) ? StashEngine::Resources.all : current_user.resources
         other_submissions = other_submissions.latest_per_dataset.where.not(identifier_id: @resource.identifier_id)
         primary_article = @resource.related_identifiers.find_by(work_type: 'primary_article')&.related_identifier
         manuscript = @resource.resource_publication.manuscript_number
-        dupes = other_submissions.where(title: @resource.title).select(:id, :title).to_a
+        dupes = other_submissions.where(title: @resource.title)&.select(:id, :title).to_a
         if primary_article.present?
           dupes.concat(other_submissions.joins(:related_identifiers)
-              .where(related_identifiers: { work_type: 'primary_article', related_identifier: primary_article }).select(:id, :title).to_a)
+              .where(related_identifiers: { work_type: 'primary_article', related_identifier: primary_article })&.select(:id, :title).to_a)
         end
         if manuscript.present?
           dupes.concat(
-            other_submissions.joins(:resource_publication).find_by(resource_publication: { manuscript_number: manuscript }).select(:id, :title).to_a
+            other_submissions.joins(:resource_publication).find_by(resource_publication: { manuscript_number: manuscript })&.select(:id, :title).to_a
           )
         end
       end
diff --git a/app/javascript/react/components/MarkdownEditor/CodeEditor.jsx b/app/javascript/react/components/MarkdownEditor/CodeEditor.jsx
index 4cfbd04013..b73d8cbf3c 100644
--- a/app/javascript/react/components/MarkdownEditor/CodeEditor.jsx
+++ b/app/javascript/react/components/MarkdownEditor/CodeEditor.jsx
@@ -105,6 +105,10 @@ export default function CodeEditor({
           base: markdownLanguage,
           extensions: [markdownTags],
         }),
+        EditorView.contentAttributes.of({
+          'aria-labelledby': 'md_editor_label',
+          'aria-errormessage': 'readme_error',
+        }),
         EditorView.updateListener.of((v) => {
           if (v.docChanged) {
             onChange(v.state.doc.toString());
diff --git a/app/javascript/react/components/MarkdownEditor/milkdownConfig.jsx b/app/javascript/react/components/MarkdownEditor/milkdownConfig.jsx
index 3bb0d8e787..10111c05a1 100644
--- a/app/javascript/react/components/MarkdownEditor/milkdownConfig.jsx
+++ b/app/javascript/react/components/MarkdownEditor/milkdownConfig.jsx
@@ -9,6 +9,7 @@ const dryadConfig = (ctx) => {
     attributes: {
       class: 'milkdown dryad-milkdown-theme',
       'aria-errormessage': 'readme_error',
+      'aria-labelledby': 'md_editor_label',
     },
   }));
 };
diff --git a/app/javascript/react/components/MarkdownEditor/milkdown_editor.css b/app/javascript/react/components/MarkdownEditor/milkdown_editor.css
index d4f7e1dafb..f52c5efc68 100644
--- a/app/javascript/react/components/MarkdownEditor/milkdown_editor.css
+++ b/app/javascript/react/components/MarkdownEditor/milkdown_editor.css
@@ -15,6 +15,7 @@
   height: 55vh;
   position: relative;
   overflow: auto;
+  background-color: white;
 }
 
 #readme_step_editor .md_editor_textarea {
diff --git a/app/javascript/react/components/MetadataEntry/Authors/Affiliations.jsx b/app/javascript/react/components/MetadataEntry/Authors/Affiliations.jsx
new file mode 100644
index 0000000000..0fb7b8c4b4
--- /dev/null
+++ b/app/javascript/react/components/MetadataEntry/Authors/Affiliations.jsx
@@ -0,0 +1,62 @@
+import React, {useState, useEffect} from 'react';
+import RorAutocomplete from '../RorAutocomplete';
+/* eslint-disable react/no-array-index-key */
+
+export default function Affiliations({
+  formRef, id, affiliations, setAffiliations,
+}) {
+  const [affs, setAffs] = useState(affiliations.length > 0 ? affiliations : [{long_name: '', ror_id: ''}]);
+
+  useEffect(() => {
+    setAffiliations(affs);
+  }, [affs]);
+
+  const updateName = (i, v) => {
+    setAffs((afs) => afs.map((a, x) => (i === x ? {...a, long_name: v} : a)));
+  };
+  const updateID = (i, v) => {
+    setAffs((afs) => afs.map((a, x) => (i === x ? {...a, ror_id: v} : a)));
+  };
+  const newAff = (e) => {
+    setAffs((afs) => afs.concat([{long_name: '', ror_id: ''}]));
+    e.target.blur();
+  };
+  const removeAff = (i) => {
+    affs.splice(i, 1);
+    setAffs(affs);
+  };
+
+  return (
+    <>
+      {affs.map((aff, i) => (
+        <div className="input-stack affiliation-input" key={`aff${i}`}>
+          <div className="input-line">
+            <label id={`label_instit_affil_${id}-${i}`} htmlFor={`instit_affil_${id}-${i}`} className="input-label">
+              Institutional affiliation
+            </label>
+            {i !== 0 && (
+              <button type="button" aria-label={`Remove affiliation ${aff.long_name}`} title="Remove affiliation" onClick={() => removeAff(i)}>
+                <i className="fas fa-xmark" aria-hidden="true" />
+              </button>
+            )}
+          </div>
+          <RorAutocomplete
+            formRef={formRef}
+            acText={aff.long_name || ''}
+            setAcText={(v) => updateName(i, v)}
+            acID={aff.ror_id}
+            setAcID={(v) => updateID(i, v)}
+            controlOptions={{
+              htmlId: `instit_affil_${id}-${i}`,
+              isRequired: true,
+              errorId: 'author_aff_error',
+              desBy: `${id}-${`aff${i}`}-ex`,
+            }}
+          />
+          <div id={`${id}-${`aff${i}`}-ex`}><i className="ie" />Employer or sponsor</div>
+        </div>
+      ))}
+      <span><button type="button" onClick={newAff}>+ Add affiliation</button></span>
+    </>
+  );
+}
diff --git a/app/javascript/react/components/MetadataEntry/Authors/AuthPreview.jsx b/app/javascript/react/components/MetadataEntry/Authors/AuthPreview.jsx
index 736dae73b8..7001d83777 100644
--- a/app/javascript/react/components/MetadataEntry/Authors/AuthPreview.jsx
+++ b/app/javascript/react/components/MetadataEntry/Authors/AuthPreview.jsx
@@ -9,12 +9,15 @@ const affName = (aff) => {
 };
 
 const getAffs = (ar) => ar.map((a) => a.affiliations).flat().reduce((arr, aff) => {
-  if (affName(aff)) arr.push([aff.id, affName(aff), aff.ror_id]);
+  if (affName(aff) && !arr.some((c) => aff.id === c[0])) arr.push([aff.id, affName(aff), aff.ror_id]);
   return arr;
 }, []);
 
 const fullname = (author) => [author?.author_first_name, author?.author_last_name].filter(Boolean).join(' ');
-const citename = (author) => [author?.author_last_name, author?.author_first_name].filter(Boolean).join(', ');
+const citename = (author) => {
+  if (author?.author_org_name) return author.author_org_name;
+  return [author?.author_last_name, author?.author_first_name].filter(Boolean).join(', ');
+};
 
 export default function AuthPreview({resource, previous, admin}) {
   const {authors} = resource;
@@ -56,37 +59,42 @@ export default function AuthPreview({resource, previous, admin}) {
               })}
               {author.author_email && (
                 <>
-                  <a
-                    href={`mailto:${author.author_email}`}
-                    className={`o-metadata__link ${previous && author.author_email !== prev?.author_email ? 'ins' : ''}`}
-                    aria-label={`Email ${fullname(author)}`}
-                    target="_blank"
-                    title={author.author_email}
-                    rel="noreferrer"
-                  >
-                    <i className="fa fa-envelope" aria-hidden="true" />
-                  </a>
-                  {previous && author.author_email !== prev?.author_email && prev?.author_email && (
-                    <sup><del>{prev.author_email}</del></sup>
+                  {author.corresp && (
+                    <a
+                      href={`mailto:${author.author_email}`}
+                      className={`o-metadata__link ${previous && author.author_email !== prev?.author_email ? 'ins' : ''}`}
+                      aria-label={`Email ${fullname(author)}`}
+                      target="_blank"
+                      title={author.author_email}
+                      rel="noreferrer"
+                    >
+                      <i className="fa fa-envelope" aria-hidden="true" />
+                    </a>
+                  )}
+                  {admin && !author.corresp && (
+                    <sup title="Shown for admin">
+                      {previous && author.author_email !== prev?.author_email ? <ins>{author.author_email}</ins> : author.author_email}
+                    </sup>
                   )}
                 </>
               )}
+              {previous && author.author_email !== prev?.author_email && prev?.author_email && (
+                <sup><del>{prev.author_email}</del></sup>
+              )}
               {author.author_orcid && (
-                <>
-                  <a
-                    href={orcidURL(author.author_orcid)}
-                    className={`o-metadata__link ${previous && author.author_orcid !== prev?.author_orcid ? 'ins' : ''}`}
-                    target="_blank"
-                    aria-label={`${fullname(author)} ORCID profile (opens in new window)`}
-                    title={`ORCID: ${author.author_orcid}`}
-                    rel="noreferrer"
-                  >
-                    <i className="fab fa-orcid" aria-hidden="true" />
-                  </a>
-                  {previous && author.author_orcid !== prev?.author_orcid && prev?.author_orcid && (
-                    <sup><del>{prev.author_orcid}</del></sup>
-                  )}
-                </>
+                <a
+                  href={orcidURL(author.author_orcid)}
+                  className={`o-metadata__link ${previous && author.author_orcid !== prev?.author_orcid ? 'ins' : ''}`}
+                  target="_blank"
+                  aria-label={`${fullname(author)} ORCID profile (opens in new window)`}
+                  title={`ORCID: ${author.author_orcid}`}
+                  rel="noreferrer"
+                >
+                  <i className="fab fa-orcid" aria-hidden="true" />
+                </a>
+              )}
+              {previous && author.author_orcid !== prev?.author_orcid && prev?.author_orcid && (
+                <sup><del>{prev.author_orcid}</del></sup>
               )}
               {i < authors.length - 1 && '; '}
             </Fragment>
diff --git a/app/javascript/react/components/MetadataEntry/Authors/AuthorForm.jsx b/app/javascript/react/components/MetadataEntry/Authors/AuthorForm.jsx
index cde10cebbc..5032b93952 100644
--- a/app/javascript/react/components/MetadataEntry/Authors/AuthorForm.jsx
+++ b/app/javascript/react/components/MetadataEntry/Authors/AuthorForm.jsx
@@ -1,55 +1,33 @@
 import React, {useState, useRef} from 'react';
 import {Field, Form, Formik} from 'formik';
-import axios from 'axios';
 import PropTypes from 'prop-types';
-import {showModalYNDialog, showSavedMsg, showSavingMsg} from '../../../../lib/utils';
-import RorAutocomplete from '../RorAutocomplete';
+import Affiliations from './Affiliations';
+import OrcidInfo from './OrcidInfo';
 
-// author below has nested affiliation
 export default function AuthorForm({
-  author, update, remove, ownerId,
+  author, update, ownerId, admin,
 }) {
   const formRef = useRef(0);
-
-  // the follow autocomplete items are lifted up state that is normally just part of the form, but doesn't work with Formik
-  const [acText, setAcText] = useState(author?.affiliations[0]?.long_name || '');
-  const [acID, setAcID] = useState(author?.affiliations[0]?.ror_id || '');
+  const [affiliations, setAffiliations] = useState(author?.affiliations);
 
   const submitForm = (values) => {
-    showSavingMsg();
-
-    // set up values
-    const csrf = document.querySelector("meta[name='csrf-token']")?.getAttribute('content');
-
-    const submitVals = {
-      authenticity_token: csrf,
-      author: {
-        id: values.id,
-        author_first_name: values.author_first_name,
-        author_last_name: values.author_last_name,
-        author_email: values.author_email,
-        resource_id: author.resource_id,
-        affiliation: {long_name: acText, ror_id: acID},
-      },
+    const submit = {
+      id: values.id,
+      author_first_name: values.author_first_name,
+      author_last_name: values.author_last_name,
+      author_org_name: values.author_org_name || null,
+      author_email: values.author_email,
+      resource_id: author.resource_id,
+      affiliations,
     };
+    return update(submit);
+  };
 
-    // submit by json
-    return axios.patch(
-      '/stash_datacite/authors/update',
-      submitVals,
-      {
-        headers: {
-          'Content-Type': 'application/json; charset=utf-8',
-          Accept: 'application/json',
-        },
-      },
-    ).then((data) => {
-      if (data.status !== 200) {
-        console.log('Response failure not a 200 response from author save');
-      }
-      update((authors) => authors.map((a) => (a.id === values.id ? data.data : a)));
-      showSavedMsg();
-    });
+  const validateEmail = (value) => {
+    if (value && !/^[\w+\-.]+@[a-z\d-]+(\.[a-z\d-]+)*\.[a-z]+$/i.test(value)) {
+      return 'Invalid email address';
+    }
+    return null;
   };
 
   return (
@@ -58,95 +36,108 @@ export default function AuthorForm({
         {
           author_first_name: (author.author_first_name || ''),
           author_last_name: (author.author_last_name || ''),
+          author_org_name: (author.author_org_name || ''),
           author_email: (author.author_email || ''),
           id: (author.id),
         }
       }
       innerRef={formRef}
       onSubmit={(values, {setSubmitting}) => {
-        submitForm(values).then(() => { setSubmitting(false); });
+        submitForm(values);
+        setSubmitting(false);
       }}
+      validateOnChange={false}
     >
-      {(formik) => (
+      {({handleSubmit, errors, touched}) => (
         <Form className="author-form">
           <Field name="id" type="hidden" />
-          <div className="input-stack">
-            <label className="input-label" htmlFor={`author_first_name__${author.id}`}>
-              First name
-            </label>
-            <Field
-              id={`author_first_name__${author.id}`}
-              name="author_first_name"
-              type="text"
-              className="c-input__text"
-              aria-errormessage="author_fname_error"
-              onBlur={() => { // defaults to formik.handleBlur
-                formik.handleSubmit();
-              }}
-            />
-          </div>
-          <div className="input-stack">
-            <label className="input-label" htmlFor={`author_last_name__${author.id}`}>
-              Last name
-            </label>
-            <Field
-              id={`author_last_name__${author.id}`}
-              name="author_last_name"
-              type="text"
-              className="c-input__text"
-              aria-errormessage="author_lname_error"
-              onBlur={() => { // defaults to formik.handleBlur
-                formik.handleSubmit();
-              }}
-            />
-          </div>
-          <div className="input-stack">
-            <RorAutocomplete
-              formRef={formRef}
-              acText={acText}
-              setAcText={setAcText}
-              acID={acID}
-              setAcID={setAcID}
-              controlOptions={{
-                htmlId: `instit_affil_${author.id}`,
-                labelText: 'Institutional affiliation',
-                isRequired: true,
-                errorId: 'author_aff_error',
-              }}
-            />
-          </div>
-          <div className="input-stack">
-            <label className={`input-label ${(author.author_orcid ? 'required' : 'optional')}`} htmlFor={`author_email__${author.id}`}>
-              Author email
-            </label>
-            <Field
-              id={`author_email__${author.id}`}
-              name="author_email"
-              type="text"
-              className="c-input__text"
-              aria-errormessage="author_email_error"
-              onBlur={() => { // defaults to formik.handleBlur
-                formik.handleSubmit();
-              }}
-            />
-          </div>
-          { ownerId !== author.id && (
-            <span>
-              <button
-                type="button"
-                className="remove-record"
-                onClick={() => {
-                  showModalYNDialog('Are you sure you want to remove this author?', () => {
-                    remove(author.id, author.resource_id);
-                    // deleteItem(auth.id);
-                  });
-                }}
-                aria-label="Remove author"
-                title="Remove"
-              >
-                <i className="fas fa-trash-can" aria-hidden="true" />
-              </button>
-            </span>
+          {author.author_org_name !== null ? (
+            <div className="input-stack affiliation-input" style={{paddingBottom: '1ch'}}>
+              <label className="input-label" htmlFor={`author_org_name__${author.id}`}>
+                Organization or group name
+              </label>
+              <Field
+                id={`author_org_name__${author.id}`}
+                name="author_org_name"
+                type="text"
+                className="c-input__text"
+                aria-errormessage="author_fname_error"
+                aria-describedby={`${author.id}org-ex`}
+                onBlur={handleSubmit}
+              />
+              <div id={`${author.id}org-ex`}><i className="ie" />Committee, agency, working group, etc.</div>
+            </div>
+          ) : (
+            <>
+              <div className="input-stack">
+                <label className="input-label" htmlFor={`author_first_name__${author.id}`}>
+                  First name
+                </label>
+                <Field
+                  id={`author_first_name__${author.id}`}
+                  name="author_first_name"
+                  type="text"
+                  className="c-input__text"
+                  aria-errormessage="author_fname_error"
+                  aria-describedby={`${author.id}name-ex`}
+                  onBlur={handleSubmit}
+                />
+                <div id={`${author.id}name-ex`}><i className="ie" />Given name</div>
+              </div>
+              <div className="input-stack">
+                <label className="input-label" htmlFor={`author_last_name__${author.id}`}>
+                  Last name
+                </label>
+                <Field
+                  id={`author_last_name__${author.id}`}
+                  name="author_last_name"
+                  type="text"
+                  className="c-input__text"
+                  aria-describedby={`${author.id}lname-ex`}
+                  onBlur={handleSubmit}
+                />
+                <div id={`${author.id}lname-ex`}><i className="ie" />Family name</div>
+              </div>
+              <div className="input-stack">
+                <div
+                  className="input-line"
+                  style={{
+                    gap: '1ch', justifyContent: 'space-between', alignItems: 'baseline', flexWrap: 'nowrap',
+                  }}
+                >
+                  <label className={`input-label ${(author.author_orcid ? 'required' : '')}`} htmlFor={`author_email__${author.id}`}>
+                    Email
+                  </label>
+                  <span className="radio_choice" style={{fontSize: '.98rem'}}>
+                    <label title={author.author_email ? null : 'Author email must be entered'}>
+                      <input
+                        type="checkbox"
+                        defaultChecked={author.corresp}
+                        disabled={!author.author_email}
+                        onChange={(e) => update({...author, corresp: e.target.checked})}
+                      />
+                      Corresponding
+                    </label>
+                  </span>
+                </div>
+                <Field
+                  id={`author_email__${author.id}`}
+                  name="author_email"
+                  type="text"
+                  className="c-input__text"
+                  aria-errormessage="author_email_error"
+                  aria-describedby={`${author.id}email-ex`}
+                  validate={validateEmail}
+                  onBlur={handleSubmit}
+                />
+                {errors.author_email && touched.author_email && <span className="c-ac__error_message">{errors.author_email}</span>}
+                <div id={`${author.id}email-ex`}><i />name@institution.org</div>
+              </div>
+              <Affiliations formRef={formRef} id={author.id} affiliations={affiliations} setAffiliations={setAffiliations} />
+              <div className="input-line" style={{flexBasis: '100%', maxWidth: '100%', marginTop: '.5em'}}>
+                <OrcidInfo author={author} curator={admin} ownerId={ownerId} />
+              </div>
+            </>
           )}
         </Form>
       )}
@@ -157,6 +148,6 @@ export default function AuthorForm({
 AuthorForm.propTypes = {
   author: PropTypes.object.isRequired,
   update: PropTypes.func.isRequired,
-  remove: PropTypes.func.isRequired,
+  admin: PropTypes.bool.isRequired,
   ownerId: PropTypes.number.isRequired,
 };
diff --git a/app/javascript/react/components/MetadataEntry/Authors/Authors.jsx b/app/javascript/react/components/MetadataEntry/Authors/Authors.jsx
index 10e80f0f8c..155734986c 100644
--- a/app/javascript/react/components/MetadataEntry/Authors/Authors.jsx
+++ b/app/javascript/react/components/MetadataEntry/Authors/Authors.jsx
@@ -2,9 +2,8 @@ import React, {useState, useEffect} from 'react';
 import axios from 'axios';
 import PropTypes from 'prop-types';
 import DragonDropList, {DragonListItem, orderedItems} from '../DragonDropList';
-import {showSavedMsg, showSavingMsg} from '../../../../lib/utils';
+import {showSavedMsg, showSavingMsg, showModalYNDialog} from '../../../../lib/utils';
 import AuthorForm from './AuthorForm';
-import OrcidInfo from './OrcidInfo';
 
 export default function Authors({
   resource, setResource, admin, ownerId,
@@ -17,12 +16,14 @@ export default function Authors({
   const blankAuthor = {
     author_first_name: '',
     author_last_name: '',
+    author_org_name: null,
     author_email: '',
     author_orcid: null,
     resource_id: resource.id,
   };
 
-  const addNewAuthor = () => {
+  const addNewAuthor = (org) => {
+    if (org) blankAuthor.author_org_name = '';
     const authorJson = {authenticity_token, author: {...blankAuthor, author_order: lastOrder()}};
     axios.post(
       '/stash_datacite/authors/create',
@@ -36,6 +37,21 @@ export default function Authors({
     });
   };
 
+  const updateItem = (author) => {
+    showSavingMsg();
+    return axios.patch(
+      '/stash_datacite/authors/update',
+      {authenticity_token, author},
+      {headers: {'Content-Type': 'application/json; charset=utf-8', Accept: 'application/json'}},
+    ).then((data) => {
+      if (data.status !== 200) {
+        console.log('Response failure not a 200 response from author save');
+      }
+      setAuthors((as) => as.map((a) => (a.id === author.id ? data.data : a)));
+      showSavedMsg();
+    });
+  };
+
   const removeItem = (id, resource_id) => {
     showSavingMsg();
     const submitVals = {authenticity_token, author: {id, resource_id}};
@@ -48,7 +64,7 @@ export default function Authors({
       }
       showSavedMsg();
     });
-    setAuthors((a) => a.filter((item) => (item.id !== id)));
+    setAuthors((a) => a.filter((item) => item.id !== id));
   };
 
   useEffect(() => {
@@ -57,23 +73,41 @@ export default function Authors({
 
   return (
     <>
-      <h2 id="authors-head">Authors</h2>
+      <div className="drag-instruct">
+        <h2 id="authors-head">Authors</h2>
+        <p>Drag <i className="fa-solid fa-bars-staggered" role="img" aria-label="handle button" /> to reorder</p>
+      </div>
       <DragonDropList model="author" typeName="author" items={authors} path="/stash_datacite/authors/reorder" setItems={setAuthors}>
         {orderedItems({items: authors, typeName: 'author'}).map((author) => (
           <DragonListItem key={author.id} item={author} typeName="author">
-            <AuthorForm author={author} update={setAuthors} remove={removeItem} ownerId={ownerId} />
-            <OrcidInfo author={author} curator={admin} ownerId={ownerId} />
+            <AuthorForm author={author} update={updateItem} admin={admin} ownerId={ownerId} />
+            {ownerId !== author.id && (
+              <button
+                type="button"
+                className="remove-record"
+                onClick={() => {
+                  showModalYNDialog('Are you sure you want to remove this author?', () => {
+                    removeItem(author.id, author.resource_id);
+                    // deleteItem(auth.id);
+                  });
+                }}
+                aria-label="Remove author"
+                title="Remove"
+              >
+                <i className="fas fa-trash-can" aria-hidden="true" />
+              </button>
+            )}
           </DragonListItem>
         ))}
       </DragonDropList>
-      <div style={{textAlign: 'right'}}>
-        <button
-          className="o-button__plain-text1"
-          type="button"
-          onClick={addNewAuthor}
-        >
+      <div className="auth-buttons">
+        <button type="button" className="o-button__plain-text1" onClick={() => addNewAuthor(false)}>
           + Add author
         </button>
+        <i className="fas fa-slash" role="img" alt=" or " />
+        <button type="button" className="o-button__plain-text4" onClick={() => addNewAuthor(true)}>
+          + Add group author
+        </button>
       </div>
     </>
   );
diff --git a/app/javascript/react/components/MetadataEntry/Authors/OrcidInfo.jsx b/app/javascript/react/components/MetadataEntry/Authors/OrcidInfo.jsx
index 8036f50604..f2b33bda0c 100644
--- a/app/javascript/react/components/MetadataEntry/Authors/OrcidInfo.jsx
+++ b/app/javascript/react/components/MetadataEntry/Authors/OrcidInfo.jsx
@@ -10,7 +10,7 @@ export default function OrcidInfo({
 }) {
   const orcidInfo = author.author_orcid ? orcidURL(author.author_orcid) : null;
   return (
-    <p className="input-line" style={{marginLeft: '38px', marginBottom: 0}}>
+    <>
       {orcidInfo && (
         <span>
           <i className="fab fa-orcid" aria-hidden="true" />&nbsp;
@@ -19,7 +19,7 @@ export default function OrcidInfo({
       )}
       {ownerId === author.id && (
         <span>
-          <i className="fas fa-address-card" aria-hidden="true" />&nbsp;Corresponding author
+          <i className="fas fa-address-card" aria-hidden="true" />&nbsp;Submitter
         </span>
       )}
       {(curator && !orcidInfo && author.orcid_invite_path) ? (
@@ -27,7 +27,7 @@ export default function OrcidInfo({
           Associate &nbsp;<i className="fab fa-orcid" aria-hidden="true" />&nbsp;at {author.orcid_invite_path}
         </span>
       ) : ''}
-    </p>
+    </>
   );
 }
 
diff --git a/app/javascript/react/components/MetadataEntry/Authors/index.jsx b/app/javascript/react/components/MetadataEntry/Authors/index.jsx
index 5c5c58224e..b3d3b6e49c 100644
--- a/app/javascript/react/components/MetadataEntry/Authors/index.jsx
+++ b/app/javascript/react/components/MetadataEntry/Authors/index.jsx
@@ -4,6 +4,8 @@ import {upCase, ordinalNumber} from '../../../../lib/utils';
 export {default} from './Authors';
 export {default as AuthPreview} from './AuthPreview';
 
+const checkName = (a) => [a.author_first_name, a.author_last_name, a.author_org_name].filter(Boolean).join(' ').toLowerCase();
+
 export const authorCheck = (authors, id) => {
   if (!authors.find((a) => a.id === id)?.author_email) {
     const ind = authors.findIndex((a) => a.id === id);
@@ -11,26 +13,39 @@ export const authorCheck = (authors, id) => {
       <p className="error-text" id="author_email_error" data-index={ind}>Submitting author email is required</p>
     );
   }
-  const fnameErr = authors.findIndex((a) => !a.author_first_name);
+  const fnameErr = authors.findIndex((a) => !a.author_first_name && !a.author_org_name);
   if (fnameErr >= 0) {
     return (
       <p className="error-text" id="author_fname_error" data-index={fnameErr}>
-        {upCase(ordinalNumber(fnameErr + 1))} author first name is required
+        {upCase(ordinalNumber(fnameErr + 1))} author name is required
       </p>
     );
   }
-  const lnameErr = authors.findIndex((a) => !a.author_last_name);
-  if (lnameErr >= 0) {
+  const affErr = authors.findIndex((a) => !a.author_org_name && !a.affiliations?.[0]?.long_name);
+  if (affErr >= 0) {
     return (
-      <p className="error-text" id="author_lname_error" data-index={lnameErr}>
-        {upCase(ordinalNumber(lnameErr + 1))} author last name is required
+      <p className="error-text" id="author_aff_error" data-index={affErr}>{upCase(ordinalNumber(affErr + 1))} author affiliation is required</p>
+    );
+  }
+  const dupeName = authors.findIndex((a, i) => authors.find((au, x) => (i === x ? false : checkName(a) === checkName(au))));
+  if (dupeName >= 0) {
+    const name = checkName(authors[dupeName]);
+    const last = authors.findLastIndex((a) => checkName(a) === name);
+    return (
+      <p className="error-text" id="author_fname_error" data-index={last}>
+        The {ordinalNumber(last + 1)} author&apos;s name is the same as the {ordinalNumber(dupeName + 1)} author. Is this a duplicate?
       </p>
     );
   }
-  const affErr = authors.findIndex((a) => !a.affiliations?.[0]?.long_name);
-  if (affErr >= 0) {
+  const dupeEmail = authors.findIndex((a, i) => authors.find((au, x) => (i === x ? false
+    : a.author_email.toLowerCase() === au.author_email.toLowerCase())));
+  if (dupeEmail >= 0) {
+    const email = authors[dupeEmail].author_email;
+    const last = authors.findLastIndex((a) => a.author_email === email);
     return (
-      <p className="error-text" id="author_aff_error" data-index={affErr}>{upCase(ordinalNumber(affErr + 1))} author affiliation is required</p>
+      <p className="error-text" id="author_email_error" data-index={last}>
+        The {ordinalNumber(last + 1)} author&apos;s email address the same as the {ordinalNumber(dupeEmail + 1)} author. Is this a duplicate?
+      </p>
     );
   }
   return false;
diff --git a/app/javascript/react/components/MetadataEntry/Autocomplete.jsx b/app/javascript/react/components/MetadataEntry/Autocomplete.jsx
index 015e1b60e8..15c66355e0 100644
--- a/app/javascript/react/components/MetadataEntry/Autocomplete.jsx
+++ b/app/javascript/react/components/MetadataEntry/Autocomplete.jsx
@@ -29,7 +29,7 @@ export default function Autocomplete(
   {
     acText, setAcText, acID, setAcID, setAutoBlurred, supplyLookupList, nameFunc, idFunc,
     controlOptions: {
-      htmlId, labelText, isRequired, errorId, saveOnEnter, showDropdown,
+      htmlId, labelText, desBy, isRequired, errorId, saveOnEnter, showDropdown,
     },
   },
 ) {
@@ -115,6 +115,8 @@ export default function Autocomplete(
         aria-controls={`menu_${htmlId}`}
         className="c-auto_complete"
         aria-errormessage={errorId || null}
+        aria-label={`${labelText ? `${labelText} s` : 'S'}earch + select`}
+        aria-describedby={desBy || null}
       >
         <input
           className={`c-input__select c-ac__input ${showDropdown ? 'c-ac__input_with_button' : ''}`}
@@ -212,7 +214,7 @@ export default function Autocomplete(
           )}
           <label className="c-input__label c-ac__checkbox">
             <input type="checkbox" className="use-text-entered" checked={textEnter} onChange={saveText} />
-            {` I cannot find my ${labelText.toLowerCase()}, "${acText}", in the list`}
+            {` I cannot find my ${labelText?.toLowerCase() || 'item'}, "${acText}", in the list`}
           </label>
         </>
       )}
diff --git a/app/javascript/react/components/MetadataEntry/Description/Description.jsx b/app/javascript/react/components/MetadataEntry/Description/Description.jsx
index 77e16cfd93..5632090eb5 100644
--- a/app/javascript/react/components/MetadataEntry/Description/Description.jsx
+++ b/app/javascript/react/components/MetadataEntry/Description/Description.jsx
@@ -88,14 +88,15 @@ export default function Description({
 
   return (
     <>
-      <div className="o-heading__level3">
+      <div className="input-line spaced" style={{marginTop: '2rem'}}>
         <label
-          className={`${(mceLabel.required ? 'required' : 'optional')}`}
+          className={`input-label xl${(mceLabel.required ? ' required' : ' optional')}`}
           id={`${dcsDescription.description_type}_label`}
           htmlFor={`editor_${dcsDescription.description_type}`}
         >
           {mceLabel.label}
         </label>
+        {mceLabel.describe && <div id={`${mceLabel.label}-ex`}>{mceLabel.describe}</div>}
       </div>
       <Editor
         id={`editor_${dcsDescription.description_type}`}
@@ -127,7 +128,6 @@ export default function Description({
         onBlur={submit}
         onEditorChange={checkSubmit}
       />
-      <p style={{fontSize: '.98rem'}}>Press Alt 0 or Option 0 for help using the rich text editor with keyboard only.</p>
     </>
   );
 }
diff --git a/app/javascript/react/components/MetadataEntry/Description/DescriptionGroup.jsx b/app/javascript/react/components/MetadataEntry/Description/DescriptionGroup.jsx
index 3ee5547ebf..43621bc1a6 100644
--- a/app/javascript/react/components/MetadataEntry/Description/DescriptionGroup.jsx
+++ b/app/javascript/react/components/MetadataEntry/Description/DescriptionGroup.jsx
@@ -15,16 +15,20 @@ export default function DescriptionGroup({
   const [showCedar, setShowCedar] = useState(!!res.cedar_json);
   const [template, setTemplate] = useState(null);
 
-  const abstractLabel = {label: 'Abstract', required: true, describe: ''};
+  const abstractLabel = {
+    label: 'Abstract',
+    required: true,
+    describe: <><i className="hint" />An introductory description of your dataset</>,
+  };
   const methodsLabel = {
     label: 'Methods',
     required: false,
-    describe: 'How was this dataset collected? How has it been processed?',
+    describe: <><i className="hint" />A description of the collection and processing of the data</>,
   };
   const usageLabel = {
     label: 'Usage notes',
     required: false,
-    describe: 'What programs and/or software are required to open the data files included with your submission?',
+    describe: <><i className="ie" />Programs and software required to open the data files</>,
   };
 
   useEffect(() => {
@@ -53,7 +57,7 @@ export default function DescriptionGroup({
           {openMethods ? (
             <Description dcsDescription={methods} setResource={setRes} mceLabel={methodsLabel} admin={admin} />
           ) : (
-            <p><button type="button" className="o-button__plain-text1" onClick={() => setOpenMethods(true)}>+ Add methods section</button></p>
+            <p><button type="button" className="o-button__plain-text2" onClick={() => setOpenMethods(true)}>+ Add methods section</button></p>
           )}
           {usage?.description && (
             <Description dcsDescription={usage} setResource={setRes} mceLabel={usageLabel} admin={admin} />
diff --git a/app/javascript/react/components/MetadataEntry/Publication/Publication.jsx b/app/javascript/react/components/MetadataEntry/Publication/Publication.jsx
index c58b1b8d07..3343562ea5 100644
--- a/app/javascript/react/components/MetadataEntry/Publication/Publication.jsx
+++ b/app/javascript/react/components/MetadataEntry/Publication/Publication.jsx
@@ -77,7 +77,7 @@ export default function Publication({resource, setResource}) {
         </p>
       </fieldset>
       <fieldset id="manuscript" onChange={setOption} hidden={!checks.published || checks.published === 'yes'}>
-        <legend style={{margin: '1em 0 0'}}>
+        <legend style={{margin: '1.5em 0 0'}}>
           Is your {subType === 'collection' ? 'collection associated with' : 'data used in'} a submitted manuscript?
         </legend>
         <p className="radio_choice">
diff --git a/app/javascript/react/components/MetadataEntry/Publication/PublicationForm.jsx b/app/javascript/react/components/MetadataEntry/Publication/PublicationForm.jsx
index 3a0fce6d8d..e9026efec1 100644
--- a/app/javascript/react/components/MetadataEntry/Publication/PublicationForm.jsx
+++ b/app/javascript/react/components/MetadataEntry/Publication/PublicationForm.jsx
@@ -136,13 +136,15 @@ function PublicationForm({
                 setAPIJournal={setAPIJournal}
                 controlOptions={
                   {
-                    htmlId: 'publication',
                     labelText: 'Journal name',
+                    htmlId: 'publication',
                     isRequired: true,
                     errorId: 'journal_error',
+                    desBy: 'journal-ex',
                   }
                 }
               />
+              <div id="journal-ex"><i />Nature, Science</div>
             </div>
             {importType !== 'manuscript' && (
               <div className="input-stack">
@@ -151,7 +153,6 @@ function PublicationForm({
                 </label>
                 <Field
                   className="c-input__text"
-                  placeholder="10.5702/qlm.1266rr"
                   type="text"
                   name="primary_article_doi"
                   id="primary_article_doi"
@@ -159,9 +160,11 @@ function PublicationForm({
                     formRef.current.values.isImport = false;
                     formik.handleSubmit();
                   }}
+                  aria-describedby="doi-ex"
                   aria-errormessage="doi_error"
                   required
                 />
+                <div id="doi-ex"><i />10.5702/qlm.1266rr</div>
               </div>
             )}
             {importType !== 'published' && (
@@ -171,7 +174,6 @@ function PublicationForm({
                 </label>
                 <Field
                   className="c-input__text"
-                  placeholder="APPS-D-17-00113"
                   type="text"
                   name="msid"
                   id="msid"
@@ -179,9 +181,11 @@ function PublicationForm({
                     formRef.current.values.isImport = false;
                     formik.handleSubmit();
                   }}
+                  aria-describedby="man-ex"
                   aria-errormessage="msid_error"
                   required
                 />
+                <div id="man-ex"><i />APPS-D-17-00113</div>
               </div>
             )}
             <div className="input-stack">
diff --git a/app/javascript/react/components/MetadataEntry/Publication/Title.jsx b/app/javascript/react/components/MetadataEntry/Publication/Title.jsx
index 98ac917eac..c9b33fa5cc 100644
--- a/app/javascript/react/components/MetadataEntry/Publication/Title.jsx
+++ b/app/javascript/react/components/MetadataEntry/Publication/Title.jsx
@@ -53,14 +53,12 @@ function Title({resource, setResource}) {
             type="text"
             className="title c-input__text"
             id={`title__${resource.id}`}
-            onBlur={() => { // formRef.current.handleSubmit();
-              formik.handleSubmit();
-            }}
+            onBlur={formik.handleSubmit}
             required
+            aria-describedby="title-ex"
             aria-errormessage="title_error"
           />
-          <Field name="id" type="hidden" />
-          <Field name="authenticity_token" type="hidden" />
+          <div id="title-ex"><i className="hint" />The title should be a succinct summary of the data and its purpose or use</div>
         </Form>
       )}
     </Formik>
diff --git a/app/javascript/react/components/MetadataEntry/RelatedWorks/RelatedWorkForm.jsx b/app/javascript/react/components/MetadataEntry/RelatedWorks/RelatedWorkForm.jsx
index acef38d44b..2626e697c4 100644
--- a/app/javascript/react/components/MetadataEntry/RelatedWorks/RelatedWorkForm.jsx
+++ b/app/javascript/react/components/MetadataEntry/RelatedWorks/RelatedWorkForm.jsx
@@ -84,9 +84,7 @@ function RelatedWorkForm(
                 name="work_type"
                 as="select"
                 className="c-input__select"
-                onBlur={() => { // defaults to formik.handleBlur
-                  formik.handleSubmit();
-                }}
+                onBlur={formik.handleSubmit}
               >
                 {workTypes.map((opt) => (
                   <option key={opt[1]} value={opt[1]}>
@@ -103,16 +101,14 @@ function RelatedWorkForm(
                 id={`related_identifier__${relatedIdentifier.id}`}
                 name="related_identifier"
                 type="text"
-                size="40"
-                placeholder="example: https://doi.org/10.1594/PANGAEA.726855"
                 aria-errormessage="works_error"
+                aria-describedby={`${relatedIdentifier.id}url-ex`}
                 className="c-input__text"
-                onBlur={() => { // defaults to formik.handleBlur
-                  formik.handleSubmit();
-                }}
+                onBlur={formik.handleSubmit}
               />
+              <div id={`${relatedIdentifier.id}url-ex`}><i />https://doi.org/10.1594/PANGAEA.726855</div>
             </div>
-            <span>
+            <span style={{display: 'block', alignSelf: 'start'}}>
               <button
                 type="button"
                 className="remove-record"
@@ -130,7 +126,9 @@ function RelatedWorkForm(
           </Form>
         )}
       </Formik>
-      <RelatedWorksErrors relatedIdentifier={relatedIdentifier} />
+      <div role="status">
+        <RelatedWorksErrors relatedIdentifier={relatedIdentifier} />
+      </div>
     </>
   );
 }
diff --git a/app/javascript/react/components/MetadataEntry/RelatedWorks/RelatedWorksErrors.jsx b/app/javascript/react/components/MetadataEntry/RelatedWorks/RelatedWorksErrors.jsx
index 1dbd2dec1e..33b8ced252 100644
--- a/app/javascript/react/components/MetadataEntry/RelatedWorks/RelatedWorksErrors.jsx
+++ b/app/javascript/react/components/MetadataEntry/RelatedWorks/RelatedWorksErrors.jsx
@@ -17,14 +17,14 @@ function RelatedWorksErrors(
   if (relatedIdentifier.related_identifier) {
     if (!urlCheck(relatedIdentifier.related_identifier)) {
       return (
-        <div className="callout err" role="alert">
+        <div className="callout err">
           <p>The URL is not valid. Make sure your URL is correct and begins with <code>http://</code> or <code>https://</code>.</p>
         </div>
       );
     }
     if (!relatedIdentifier.verified) {
       return (
-        <div className="callout warn" role="alert">
+        <div className="callout warn">
           <p>The web page cannot be verified. Make sure your URL is correct.</p>
         </div>
       );
diff --git a/app/javascript/react/components/MetadataEntry/Subjects/Keywords.jsx b/app/javascript/react/components/MetadataEntry/Subjects/Keywords.jsx
index ac7c6981bd..17b99230a5 100644
--- a/app/javascript/react/components/MetadataEntry/Subjects/Keywords.jsx
+++ b/app/javascript/react/components/MetadataEntry/Subjects/Keywords.jsx
@@ -51,11 +51,18 @@ function Keywords({resource, setResource}) {
     <div className="c-keywords">
       <label className="input__label required" id="label_keyword_ac" htmlFor="keyword_ac">
         Subject keywords
-        <span className="details">(at least 3 required)</span>
+        <span className="details">(at least 3)</span>
       </label>
-      <div id="js-keywords__container" className="c-keywords__container">
+      <div
+        id="js-keywords__container"
+        className="c-keywords__container"
+        role="listbox"
+        aria-label="Subject keywords and search"
+        aria-multiselectable="true"
+        aria-describedby="keywords-ex"
+      >
         {subjs.map((subj) => (
-          <span className="c-keywords__keyword" key={subj.id}>
+          <span className="c-keywords__keyword" aria-selected="true" key={subj.id}>
             {subj.subject}
             <span className="delete_keyword">
               <button
@@ -86,6 +93,7 @@ function Keywords({resource, setResource}) {
           }
         />
       </div>
+      <div id="keywords-ex"><i className="ie" />Scientific names, method types, or keywords from your related article</div>
     </div>
   );
 }
diff --git a/app/javascript/react/components/MetadataEntry/Subjects/ResearchDomain.jsx b/app/javascript/react/components/MetadataEntry/Subjects/ResearchDomain.jsx
index 6fa28e0282..8fcf3a7d8b 100644
--- a/app/javascript/react/components/MetadataEntry/Subjects/ResearchDomain.jsx
+++ b/app/javascript/react/components/MetadataEntry/Subjects/ResearchDomain.jsx
@@ -50,6 +50,7 @@ function ResearchDomain({resource, setResource}) {
   return (
     <form className="input-stack" style={{marginBottom: '1.5em'}}>
       <div ref={fieldRef} />
+      <div className="input-example"><i className="ie" />The main scholarly or technical field for the data or project</div>
     </form>
   );
 }
diff --git a/app/javascript/react/components/MetadataEntry/Support/FacilityForm.jsx b/app/javascript/react/components/MetadataEntry/Support/FacilityForm.jsx
index 6ac125ae1a..f0a5b3925c 100644
--- a/app/javascript/react/components/MetadataEntry/Support/FacilityForm.jsx
+++ b/app/javascript/react/components/MetadataEntry/Support/FacilityForm.jsx
@@ -6,8 +6,7 @@ import RorAutocomplete from '../RorAutocomplete';
 import {showSavedMsg, showSavingMsg} from '../../../../lib/utils';
 
 export default function FacilityForm({resource, setResource}) {
-  const formRef = useRef(0);
-  const nameRef = useRef(null);
+  const formRef = useRef(null);
   const sponsor = resource.contributors.find((r) => r.contributor_type === 'sponsor') || {};
   const [name, setName] = useState(sponsor.contributor_name || '');
   const [nameId, setNameId] = useState(sponsor.name_identifier_id);
@@ -65,10 +64,12 @@ export default function FacilityForm({resource, setResource}) {
               htmlId: 'research_facility',
               labelText: 'Research facility',
               isRequired: false,
+              desBy: 'facility-ex',
             }}
           />
-          <input ref={nameRef} type="hidden" value={name} className="js-affil-longname" name="contributor[name_identifier_id]" />
-          <input type="hidden" value={nameId} className="js-affil-id" name="author[affiliation][ror_id]" />
+          <div id="facility-ex">
+            <i className="hint" />A field or other station or organization where research was conducted, apart from affiliations
+          </div>
         </Form>
       )}
     </Formik>
diff --git a/app/javascript/react/components/MetadataEntry/Support/FunderForm.jsx b/app/javascript/react/components/MetadataEntry/Support/FunderForm.jsx
index 89984dc220..2d85b669a4 100644
--- a/app/javascript/react/components/MetadataEntry/Support/FunderForm.jsx
+++ b/app/javascript/react/components/MetadataEntry/Support/FunderForm.jsx
@@ -4,10 +4,10 @@ import {Field, Form, Formik} from 'formik';
 import axios from 'axios';
 import PropTypes from 'prop-types';
 import RorAutocomplete from '../RorAutocomplete';
-import {showModalYNDialog, showSavedMsg, showSavingMsg} from '../../../../lib/utils';
+import {showSavedMsg, showSavingMsg} from '../../../../lib/utils';
 
 function FunderForm({
-  resourceId, contributor, removeFunction, updateFunder, groupings,
+  resourceId, contributor, updateFunder, groupings,
 }) {
   const formRef = useRef();
 
@@ -104,9 +104,11 @@ function FunderForm({
                   labelText: 'Granting organization',
                   isRequired: true,
                   errorId: 'funder_error',
+                  desBy: `${contributor.id}funder-ex`,
                 }
               }
             />
+            <div id={`${contributor.id}funder-ex`}><i />National Institutes of Health</div>
             {showSelect && (
               <>
                 <label htmlFor="subfunder_select" className="c-input__label" style={{marginTop: '1em'}}>{showSelect.group_label}</label>
@@ -125,10 +127,10 @@ function FunderForm({
               name="award_number"
               type="text"
               className="js-award_number c-input__text"
-              onBlur={() => { // defaults to formik.handleBlur
-                formik.handleSubmit();
-              }}
+              aria-describedby={`${contributor.id}award-ex`}
+              onBlur={formik.handleSubmit}
             />
+            <div id={`${contributor.id}award-ex`}><i />CA 123456-01A1</div>
           </div>
           <div className="input-stack">
             <label className="input-label optional" htmlFor={`contributor_award_description__${contributor.id}`}>Program/division
@@ -138,26 +140,11 @@ function FunderForm({
               name="award_description"
               type="text"
               className="js-award_description c-input__text"
-              onBlur={() => { // defaults to formik.handleBlur
-                formik.handleSubmit();
-              }}
+              aria-describedby={`${contributor.id}desc-ex`}
+              onBlur={formik.handleSubmit}
             />
+            <div id={`${contributor.id}desc-ex`}><i className="ie" />Section of the funder</div>
           </div>
-          <span>
-            <button
-              type="button"
-              className="remove-record"
-              onClick={() => {
-                showModalYNDialog('Are you sure you want to remove this funder?', () => {
-                  removeFunction(contributor.id);
-                });
-              }}
-              aria-label="Remove funding"
-              title="Remove"
-            >
-              <i className="fas fa-trash-can" aria-hidden="true" />
-            </button>
-          </span>
         </Form>
       )}
     </Formik>
@@ -171,6 +158,5 @@ export default FunderForm;
 FunderForm.propTypes = {
   resourceId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   contributor: PropTypes.object.isRequired,
-  removeFunction: PropTypes.func.isRequired,
   updateFunder: PropTypes.func.isRequired,
 };
diff --git a/app/javascript/react/components/MetadataEntry/Support/Funders.jsx b/app/javascript/react/components/MetadataEntry/Support/Funders.jsx
index b8071016a8..40dedad1c0 100644
--- a/app/javascript/react/components/MetadataEntry/Support/Funders.jsx
+++ b/app/javascript/react/components/MetadataEntry/Support/Funders.jsx
@@ -1,7 +1,7 @@
 import React, {useState, useEffect} from 'react';
 import axios from 'axios';
 import PropTypes from 'prop-types';
-import {showSavedMsg, showSavingMsg} from '../../../../lib/utils';
+import {showSavedMsg, showSavingMsg, showModalYNDialog} from '../../../../lib/utils';
 import DragonDropList, {DragonListItem, orderedItems} from '../DragonDropList';
 import FunderForm from './FunderForm';
 
@@ -112,15 +112,20 @@ function Funders({resource, setResource}) {
         <DragonDropList model="contributor" typeName="funder" items={funders} path="/stash_datacite/contributors/reorder" setItems={setFunders}>
           {orderedItems({items: funders, typeName: 'funder'}).map((contrib) => (
             <DragonListItem key={contrib.id} item={contrib} typeName="funder">
-              <FunderForm
-                key={contrib.id}
-                resourceId={resource.id}
-                contributor={contrib}
-                groupings={groupings}
-                disabled={disabled}
-                removeFunction={removeItem}
-                updateFunder={updateFunder}
-              />
+              <FunderForm resourceId={resource.id} contributor={contrib} groupings={groupings} disabled={disabled} updateFunder={updateFunder} />
+              <button
+                type="button"
+                className="remove-record"
+                onClick={() => {
+                  showModalYNDialog('Are you sure you want to remove this funder?', () => {
+                    removeItem(contrib.id);
+                  });
+                }}
+                aria-label="Remove funding"
+                title="Remove"
+              >
+                <i className="fas fa-trash-can" aria-hidden="true" />
+              </button>
             </DragonListItem>
           ))}
         </DragonDropList>
diff --git a/app/javascript/react/components/MetadataEntry/Support/Support.jsx b/app/javascript/react/components/MetadataEntry/Support/Support.jsx
index 726a1e6d84..37b1501e5c 100644
--- a/app/javascript/react/components/MetadataEntry/Support/Support.jsx
+++ b/app/javascript/react/components/MetadataEntry/Support/Support.jsx
@@ -7,7 +7,10 @@ export default function Support({resource, setResource}) {
     <>
       <h2>Support</h2>
       <FacilityForm resource={resource} setResource={setResource} />
-      <h3 id="funders-head">Funding</h3>
+      <div className="drag-instruct">
+        <h3 id="funders-head" style={{marginTop: 0}}>Funding</h3>
+        <p>Drag <i className="fa-solid fa-bars-staggered" role="img" aria-label="handle button" /> to reorder</p>
+      </div>
       <Funders resource={resource} setResource={setResource} />
     </>
   );
diff --git a/app/javascript/react/components/ReadMeWizard/ReadMeSteps.jsx b/app/javascript/react/components/ReadMeWizard/ReadMeSteps.jsx
index de32f81521..6b21542ced 100644
--- a/app/javascript/react/components/ReadMeWizard/ReadMeSteps.jsx
+++ b/app/javascript/react/components/ReadMeWizard/ReadMeSteps.jsx
@@ -32,7 +32,7 @@ export default function ReadMeSteps({
     2: {
       desc:
       <>
-        <p>Provide a comprehensive list of data files and variables. Starting information has been imported from your uploaded files.</p>
+        <p style={{marginBottom: 0}}>Provide a comprehensive list of data files and variables. Starting information has been imported from your uploaded files.</p>
         <ul>
           <li>Add any folders and data files inside compressed archives (.zip, .gz), and any missing variables</li>
           <li>Describe files and define all variables and abbreviations used, including units of measurement</li>
@@ -55,30 +55,46 @@ export default function ReadMeSteps({
     <>
       <div className="steps-wrapper">
         {Object.keys(sections).map((i) => (
-          /* eslint-disable-next-line eqeqeq */
-          <div key={`step${i}`} className={`step${i < step ? ' completed' : ''}${i == step ? ' current' : ''}`} aria-current={step == i ? 'step' : null}>
+          /* eslint-disable eqeqeq */
+          <div
+            key={`step${i}`}
+            className={`step${i < step ? ' completed' : ''}${i == step ? ' current' : ''}`}
+            aria-current={step == i ? 'step' : null}
+            role="button"
+            tabIndex={0}
+            onClick={() => setStep(i)}
+            onKeyDown={(e) => {
+              if (['Enter', 'Space'].includes(e.key)) {
+                setStep(i);
+              }
+            }}
+          >
             <span className="step-counter">{i}</span><span className="step-name">{secTitles[i - 1]}</span>
           </div>
         ))}
       </div>
-      <h2><label htmlFor="readme_step_editor">{secTitles[step - 1]}</label></h2>
-      <div>{sections[step].desc}</div>
+      <h3 id="md_editor_label">{secTitles[step - 1]}</h3>
+      <div style={{margin: '-.5em 0'}}>
+        {sections[step].desc}
+      </div>
       <MarkdownEditor
         id="readme_step_editor"
         {...(step === 1 ? {initialValue: '', replaceValue: sections[step].content} : {initialValue: sections[step].content})}
         onChange={saveContent}
       />
-      <div className="o-dataset-nav">
-        <button type="button" className="o-button__plain-text2" onClick={() => setStep(step + 1)}>
+      <div className="o-dataset-nav" style={{marginTop: '2rem', marginBottom: '2rem'}}>
+        <button type="button" className="o-button__plain-text1" onClick={() => setStep(step + 1)}>
           {step === secTitles.length ? (
             <>Complete &amp; generate README</>
           ) : (
             <>Next <i className="fa fa-caret-right" aria-hidden="true" /></>
           )}
         </button>
-        <button type="button" className="o-button__plain-text" onClick={() => setStep(step - 1)}>
-          <i className="fa fa-caret-left" aria-hidden="true" /> Previous
-        </button>
+        {step > 1 && (
+          <button type="button" className="o-button__plain-text0" onClick={() => setStep(step - 1)}>
+            <i className="fa fa-caret-left" aria-hidden="true" /> Previous
+          </button>
+        )}
       </div>
     </>
   );
diff --git a/app/javascript/react/components/ReadMeWizard/ReadMeWizard.jsx b/app/javascript/react/components/ReadMeWizard/ReadMeWizard.jsx
index 383f944527..4dafa1002f 100644
--- a/app/javascript/react/components/ReadMeWizard/ReadMeWizard.jsx
+++ b/app/javascript/react/components/ReadMeWizard/ReadMeWizard.jsx
@@ -104,7 +104,7 @@ export default function ReadMe({dcsDescription, resource, setResource}) {
   if (initialValue || replaceValue) {
     return (
       <>
-        <h2>README</h2>
+        <h2 id="md_editor_label">README</h2>
         <div className="readme-columns-final">
           <div>
             <p style={{marginTop: 0}}>
@@ -188,10 +188,14 @@ export default function ReadMe({dcsDescription, resource, setResource}) {
             dataset. It should contain the details needed to interpret and reuse your data, including abbreviations
             and codes, file descriptions, and information about any necessary software.
           </p>
+          <p>Once you&apos;ve uploaded or generated a README, you may continue to revise it in our editor.</p>
           <div className="readme-columns">
             <div>
               <h2 className="o-heading__level2">Need to create a README?</h2>
-              <p>Use our step-by-step tool to generate a README file. After completion your generated README can be added to and revised.</p>
+              <p>
+                Use our step-by-step tool to generate a README file.
+                Some information will be imported from your uploaded files, so make sure your file list is complete.
+              </p>
               <div style={{textAlign: 'center'}}>
                 <button type="button" className="o-button__plain-text1" onClick={() => setWizardStep(1)}>
                   Build a README <i className="fa fa-trowel-bricks fa-flip-horizontal" aria-hidden="true" />
@@ -200,7 +204,7 @@ export default function ReadMe({dcsDescription, resource, setResource}) {
             </div>
             <div>
               <h2 className="o-heading__level2">Already have a README file?</h2>
-              <p>If you already have a README file in <a href="https://www.markdownguide.org/" target="_blank" rel="noreferrer">markdown format<span className="screen-reader-only"> (opens in new window)</span></a> for your dataset, you can import it here. </p>
+              <p>If you already have a README file in <a href="https://commonmark.org/help/" target="_blank" rel="noreferrer">markdown format<span className="screen-reader-only"> (opens in new window)</span></a> for your dataset, you can import it here. </p>
               <ReadMeImport setValue={setReplaceValue} />
             </div>
           </div>
diff --git a/app/javascript/react/components/SubmissionHelp.jsx b/app/javascript/react/components/SubmissionHelp.jsx
index f30357c4ab..2b6bcf2970 100644
--- a/app/javascript/react/components/SubmissionHelp.jsx
+++ b/app/javascript/react/components/SubmissionHelp.jsx
@@ -35,7 +35,10 @@ export function PublicationHelp() {
 
 export function AuthHelp() {
   return (
-    <p>Affiliations are required for all authors, and an email address is required for the submitting author. Authors can be reordered.</p>
+    <>
+      <p>At least one affiliation is required for all authors. An email address is required for the submitter, who will be the point of contact for Dryad, and for any corresponding authors.</p>
+      <p>Check <b>Corresponding</b> to mark someone as a corresponding author on the published dataset.</p>
+    </>
   );
 }
 
diff --git a/app/javascript/react/components/UploadFiles/FileList/BadList.jsx b/app/javascript/react/components/UploadFiles/FileList/BadList.jsx
index 783ec242d9..239e09276d 100644
--- a/app/javascript/react/components/UploadFiles/FileList/BadList.jsx
+++ b/app/javascript/react/components/UploadFiles/FileList/BadList.jsx
@@ -22,7 +22,7 @@ const makeAndString = (arr) => {
   return `${firsts.join(', ')} and ${last}`;
 };
 
-const badList = (props) => {
+export default function BadList(props) {
   const errorFiles = filterForStatus('error', props.chosenFiles);
   const issueFiles = filterForStatus('issues', props.chosenFiles);
   if (errorFiles.length + issueFiles.length < 1) return (null);
@@ -32,52 +32,49 @@ const badList = (props) => {
 
   if (errorFiles.length > 0) {
     errorMsg = (
-      <div className="c-alert__text-lite">
-        Our tabular data checker couldn&apos;t read tabular data from {makeAndString(errorFiles)}.
-        If you expect them to have consistent tabular data, check that they are readable and formatted correctly.
+      <div className="callout err" role="alert">
+        <p>
+          Our tabular data checker couldn&apos;t read tabular data from {makeAndString(errorFiles)}.
+          If you expect them to have consistent tabular data, check that they are readable and formatted correctly.
+        </p>
       </div>
     );
   }
 
   if (issueFiles.length > 0) {
     issueMsg = (
-      <div>
-        <span className="c-alert__text-lite">
-          Our automated tabular data checker identified potential inconsistencies in the format and structure of {issueFiles.length} of your files.
-        </span>
-        <p>
-          <a href="/stash/data_check_guide" target="_blank">
-            A detailed report is available<span className="screen-reader-only"> (opens in new window)</span>
-          </a>
-          {' '}for each file. To address the identified alerts:
+      <div className="callout err" role="alert" style={{paddingBottom: '.75rem', marginBottom: '1em'}}>
+        <p style={{marginBottom: '.5rem'}}>
+          Tabular data checker found inconsistencies in the format and structure of {issueFiles.length} of your files
         </p>
-        <ol>
-          <li>
-            Click the alert button in the
-            {' '}<em>Tabular data check</em>{' '}
-            column to see what has been highlighted for your review.
-          </li>
-          <li>Review the local copy of your file and make any desired changes.</li>
-          <li>
-            If you would like to replace the file, click &quot;Remove&quot; in the <em>Actions</em> column to delete the current upload.
-          </li>
-          <li>
-            Re-upload the corrected file using the &quot;Choose files&quot; or &quot;Enter URLs&quot; button above.
-          </li>
-        </ol>
+        <div style={{backgroundColor: 'white', padding: '.75rem', fontSize: '.98rem'}}>
+          <p style={{marginTop: 0}}>
+            <a href="/stash/data_check_guide" target="_blank">
+              A detailed report<span className="screen-reader-only"> (opens in new window)</span>
+            </a>
+            {' '}is available for each file. To address the identified alerts:
+          </p>
+          <ol style={{marginBottom: 0}}>
+            <li>
+              Click the alert button in the <em>Tabular data check</em> column to see what has been highlighted for your review.
+            </li>
+            <li>Review the local copy of your file and make any desired changes.</li>
+            <li>
+              If you would like to replace the file, click &quot;Remove&quot; in the <em>Actions</em> column to delete the current upload.
+            </li>
+            <li>
+              Re-upload the corrected file using the &quot;Choose files&quot; or &quot;Enter URLs&quot; button above.
+            </li>
+          </ol>
+        </div>
       </div>
     );
   }
 
   return (
-    <div className="js-alert c-alert--error-lite" role="alert">
-      <div className="c-alert__text">
-        {errorMsg}
-        {issueMsg}
-      </div>
-      <button type="button" aria-label="close" className="js-alert__close o-button__close-lite c-alert__close-lite" />
-    </div>
+    <>
+      {errorMsg}
+      {issueMsg}
+    </>
   );
-};
-
-export default badList;
+}
diff --git a/app/javascript/react/components/UploadFiles/FileList/File.jsx b/app/javascript/react/components/UploadFiles/FileList/File.jsx
index d702610bfe..540eb463ae 100644
--- a/app/javascript/react/components/UploadFiles/FileList/File.jsx
+++ b/app/javascript/react/components/UploadFiles/FileList/File.jsx
@@ -51,19 +51,20 @@ export default function File({file, clickRemove, clickValidationReport}) {
         // console.log(e);
       }
       return (
-        <div style={{display: 'flex', alignItems: 'center'}}>
-          <div className="c-alert--error-icon">
-            <button
-              className="o-button__plain-text5"
-              onClick={clickValidationReport}
-              aria-haspopup="dialog"
-              type="button"
-              style={{padding: '10px'}}
-            >
-              View {jsReport?.report?.stats?.errors} alerts
-            </button>
-          </div>
-        </div>
+        <button
+          className="o-button__plain-textlink"
+          onClick={clickValidationReport}
+          aria-haspopup="dialog"
+          type="button"
+        >
+          <i
+            className="fa-solid fa-triangle-exclamation"
+            style={{color: 'rgb(209, 44, 29)', marginRight: '.5ch'}}
+            role="img"
+            aria-label="Has alerts"
+          />
+          View {jsReport?.report?.stats?.errors} alerts
+        </button>
       );
     }
     case TabularCheckStatus.na:
@@ -81,10 +82,8 @@ export default function File({file, clickRemove, clickValidationReport}) {
     <tr>
       <th scope="row">{file.sanitized_name}</th>
       <td id={`status_${file.id}`} className="c-uploadtable__status">{file.status}</td>
-      <td>
-        <span className={statusCss(file.tabularCheckStatus)}>
-          {tabularInfo}
-        </span>
+      <td className={statusCss(file.tabularCheckStatus)}>
+        {tabularInfo}
       </td>
       <td>
         {file.url && (
@@ -99,8 +98,8 @@ export default function File({file, clickRemove, clickValidationReport}) {
         {removing ? (
           <i className="fa fa-circle-o-notch fa-spin" aria-hidden="true" />
         ) : (
-          <button onClick={removeClick} type="button" className="c-upload__button">
-            Remove
+          <button onClick={removeClick} type="button" className="o-button__plain-textlink">
+            <i className="fas fa-trash-can" aria-hidden="true" style={{marginRight: '.5ch'}} />Remove
           </button>
         )}
       </td>
diff --git a/app/javascript/react/components/UploadFiles/FileList/File.module.css b/app/javascript/react/components/UploadFiles/FileList/File.module.css
index f43fc4f78a..a8f0cb5484 100644
--- a/app/javascript/react/components/UploadFiles/FileList/File.module.css
+++ b/app/javascript/react/components/UploadFiles/FileList/File.module.css
@@ -5,7 +5,3 @@
 .Passed {
     font-weight: normal;
 }
-
-.ValidationError {
-    color: #cf4817;
-}
\ No newline at end of file
diff --git a/app/javascript/react/components/UploadFiles/FileList/FileList.jsx b/app/javascript/react/components/UploadFiles/FileList/FileList.jsx
index a9d8d34c4f..dcfb2e966f 100644
--- a/app/javascript/react/components/UploadFiles/FileList/FileList.jsx
+++ b/app/javascript/react/components/UploadFiles/FileList/FileList.jsx
@@ -7,11 +7,11 @@ const file_list = ({
   chosenFiles, clickedRemove, clickedValidationReport, totalSize,
 }) => (
   <>
+    <BadList chosenFiles={chosenFiles} />
     <div className="c-uploadtable-header">
-      <h2 className="o-heading__level2" id="filelist_id">Files</h2>
+      <h3 className="o-heading__level3" id="filelist_id">Selected files</h3>
       <p>Total size: {totalSize}</p>
     </div>
-    <BadList chosenFiles={chosenFiles} />
     <div className="table-wrapper c-uploadtable-wrapper" role="region" aria-labelledby="filelist_id">
       <table className="c-uploadtable">
         <thead>
diff --git a/app/models/stash_datacite/resource/dataset_validations.rb b/app/models/stash_datacite/resource/dataset_validations.rb
index 480cb0d382..4674123b9f 100644
--- a/app/models/stash_datacite/resource/dataset_validations.rb
+++ b/app/models/stash_datacite/resource/dataset_validations.rb
@@ -151,10 +151,10 @@ def authors
         temp_err = []
         @resource.authors.each_with_index do |author, idx|
 
-          if author.author_first_name.blank? || author.author_last_name.blank?
-            temp_err << ErrorItem.new(message: "Fill #{(idx + 1).ordinalize} author's {first and last name}",
+          if author.author_first_name.blank?
+            temp_err << ErrorItem.new(message: "Fill #{(idx + 1).ordinalize} author's {first name}",
                                       page: metadata_page(@resource),
-                                      ids: ["author_first_name__#{author.id}", "author_last_name__#{author.id}"])
+                                      ids: ["author_first_name__#{author.id}"])
           end
 
           affil = author.affiliation || StashDatacite::Affiliation.new # there is always an affiliation this way
diff --git a/app/models/stash_engine/author.rb b/app/models/stash_engine/author.rb
index 47e8885ebe..39db7850cc 100644
--- a/app/models/stash_engine/author.rb
+++ b/app/models/stash_engine/author.rb
@@ -8,6 +8,8 @@
 #  author_last_name   :string(191)
 #  author_orcid       :string(191)
 #  author_order       :integer
+#  author_org_name    :string(255)
+#  corresp            :boolean          default(FALSE)
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
 #  resource_id        :integer
@@ -59,15 +61,18 @@ def affiliation
     def affiliation=(affil)
       return unless affil.is_a?(StashDatacite::Affiliation)
 
-      affiliations.destroy_all
       affiliations << affil
     end
 
     def author_full_name
+      return author_org_name unless author_org_name.blank?
+
       [author_last_name, author_first_name].reject(&:blank?).join(', ')
     end
 
     def author_standard_name
+      return author_org_name unless author_org_name.blank?
+
       "#{author_first_name} #{author_last_name}".strip
     end
 
diff --git a/app/models/stash_engine/resource_publication.rb b/app/models/stash_engine/resource_publication.rb
index f81a69ac5c..6d38c2e7cc 100644
--- a/app/models/stash_engine/resource_publication.rb
+++ b/app/models/stash_engine/resource_publication.rb
@@ -14,10 +14,6 @@
 #
 #  index_stash_engine_resource_publications_on_resource_id  (resource_id) UNIQUE
 #
-# Foreign Keys
-#
-#  fk_rails_...  (resource_id => stash_engine_resources.id)
-#
 module StashEngine
   class ResourcePublication < ApplicationRecord
     self.table_name = 'stash_engine_resource_publications'
diff --git a/app/views/stash_datacite/authors/_show.html.erb b/app/views/stash_datacite/authors/_show.html.erb
index d55fa9e773..841a50cb44 100644
--- a/app/views/stash_datacite/authors/_show.html.erb
+++ b/app/views/stash_datacite/authors/_show.html.erb
@@ -1,82 +1,57 @@
 <% unless authors.nil? %>
-  <% if highlight_fields.present? && current_user&.min_app_admin? %>
-  	<div class="o-metadata__group1">
-	  	<% authors.each_with_index do |author, i| %>
-	  		<% highlights = highlight_fields.detect {|h| h[:index] == i} %>
-				<%= ([ (author.author_full_name ?
-					"<b #{'class="highlight"' if highlights&.key?(:author_full_name)}'>#{h(author.author_full_name)}</b>" : nil) ] +
-			     author.affiliations.map{|i|
-						     if i.smart_name.present? && i.smart_name != ',' && i.smart_name != '.'
-						       "<span class='o-metadata__affiliation#{' highlight' if highlights&.key?(:affiliation)}'>#{h(i.smart_name)}#{'<i class="fas fa-triangle-exclamation unmatched-icon" role="note" aria-label="Unmatched affiliation" title="Unmatched affiliation"></i>' unless i.ror_id}</span>"
-						     else
-						       nil
-						     end
-			     } +
-			     [ (author.author_orcid ? "<span class='c-orcid__icon'></span><span>#{display_author_orcid(author)}</span>" : nil) ] + [(author.author_email.present? ?
-							"<span class='#{' highlight' if highlights&.key?(:email)}'>#{author.author_email}</span>" : nil)])
-			     .flatten.reject(&:blank?).join(", ").html_safe %>
-			     <br/>
-		  <% end %>
-		  <% deleted = highlight_fields.detect {|h| h.key?(:deleted) } %>
-		  <% if deleted %>
-		  	<div class="highlight"><%= deleted[:deleted] %> authors deleted</div>
-		  <% end %>
-		</div>
-  <% else %>
-    <% affs = authors.map(&:affiliations).flatten.uniq.each_with_object([]) do |a, arr| 
-  		if a.smart_name.present? && a.smart_name != ',' && a.smart_name != '.'
-  			arr << [a.id, a.smart_name, a.ror_id]
-			end
-			arr
-		end %>
-		<p class="o-metadata__author-list">
-    <%= authors.map { |author| 
-    	if author.author_full_name
-	    	str = "<span class='o-metadata__author'>#{author.author_full_name}</span>"
-	    	af = author.affiliations.map { |a|
-			     if a.smart_name.present? && a.smart_name != ',' && a.smart_name != '.'
-			       "<a class='o-metadata__link' aria-label='Affiliation #{affs.index { |x| x[0] == a.id } + 1}' href='#aff#{a.id}'>#{affs.index { |x| x[0] == a.id } + 1}</a>"
-			     else
-			       nil
-			     end
-		     }.join(', ')
-		    str += af unless af.blank?
-		    str += "<a href='mailto:#{author.author_email}' class='o-metadata__link' aria-label='Email #{author.author_standard_name}' target='_blank' title='#{author.author_email}'><i class='fa fa-envelope' aria-hidden='true'></i></a>" if author.author_email.present?
-		    str += "<a href='#{author_orcid_link(author)}' class='o-metadata__link' target='_blank' aria-label='#{author.author_standard_name} ORCID profile (opens in new window)' title='ORCID: #{author.author_orcid}'><i class='fab fa-orcid' aria-hidden='true'></i></a>" if author.author_orcid.present?
-		    str
-		  end
-	  }.reject(&:blank?).join("; ").html_safe %>
-		</p>
-  <% end %>
-  <% if affs.present? %>
-	  <div class="o-metadata__aff-list">
-	  	<p role="heading" aria-level="2"><button class="o-button__plain-text4" id="affiliation-list-button" aria-expanded="false" aria-controls="affiliation-list">Author affiliations<i class="fas fa-caret-down" aria-hidden="true"></i></button></p>
-	  	<ol id="affiliation-list" hidden>
-	  	<% affs.map do |aff| %>
-	  		<li id="aff<%= aff[0] %>"><%= aff[1] %><%if current_user&.min_app_admin? && aff[2].blank? %><i class="fas fa-triangle-exclamation unmatched-icon" role="note" aria-label="Unmatched affiliation" title="Unmatched affiliation"></i><%end%></li>
-	  	<% end %>
-	  	</l>
-	  </div>
-	  <script type="text/javascript">
-	  	document.getElementById('affiliation-list-button').addEventListener('click', (e) => {
-	  		const list = document.getElementById('affiliation-list')
-	  		if (list.hasAttribute('hidden')) {
-		  		e.target.setAttribute('aria-expanded', 'true')
-	  		} else {
-	  			e.target.setAttribute('aria-expanded', 'false')
-		  	}
-		  	e.target.lastElementChild.classList.toggle('fa-caret-down')
-		  	e.target.lastElementChild.classList.toggle('fa-caret-up')
-		  	list.toggleAttribute('hidden')
-	  	})
-	  	const openHash = () => {
-	  		const hashed = document.getElementById(window.location.hash.substring(1))
-		    if (hashed.parentElement.hasAttribute('hidden')) {
-		    	document.getElementById('affiliation-list-button').click()
-		    }
+  <% affs = authors.map(&:affiliations).flatten.uniq.each_with_object([]) do |a, arr| 
+		if a.smart_name.present? && a.smart_name != ',' && a.smart_name != '.'
+			arr << [a.id, a.smart_name, a.ror_id]
+		end
+		arr
+	end %>
+	<p class="o-metadata__author-list">
+  <%= authors.map { |author| 
+  	if author.author_full_name
+    	str = "<span class='o-metadata__author'>#{author.author_full_name}</span>"
+    	af = author.affiliations.map { |a|
+		     if a.smart_name.present? && a.smart_name != ',' && a.smart_name != '.'
+		       "<a class='o-metadata__link' aria-label='Affiliation #{affs.index { |x| x[0] == a.id } + 1}' href='#aff#{a.id}'>#{affs.index { |x| x[0] == a.id } + 1}</a>"
+		     else
+		       nil
+		     end
+	     }.join(', ')
+	    str += af unless af.blank?
+	    str += "<a href='mailto:#{author.author_email}' class='o-metadata__link' aria-label='Email #{author.author_standard_name}' target='_blank' title='#{author.author_email}'><i class='fa fa-envelope' aria-hidden='true'></i></a>" if author.corresp && author.author_email.present?
+	    str += "<a href='#{author_orcid_link(author)}' class='o-metadata__link' target='_blank' aria-label='#{author.author_standard_name} ORCID profile (opens in new window)' title='ORCID: #{author.author_orcid}'><i class='fab fa-orcid' aria-hidden='true'></i></a>" if author.author_orcid.present?
+	    str
+	  end
+  }.reject(&:blank?).join("; ").html_safe %>
+	</p>
+<% end %>
+<% if affs.present? %>
+  <div class="o-metadata__aff-list">
+  	<p role="heading" aria-level="2"><button class="o-button__plain-text4" id="affiliation-list-button" aria-expanded="false" aria-controls="affiliation-list">Author affiliations<i class="fas fa-caret-down" aria-hidden="true"></i></button></p>
+  	<ol id="affiliation-list" hidden>
+  	<% affs.map do |aff| %>
+  		<li id="aff<%= aff[0] %>"><%= aff[1] %><%if current_user&.min_app_admin? && aff[2].blank? %><i class="fas fa-triangle-exclamation unmatched-icon" role="note" aria-label="Unmatched affiliation" title="Unmatched affiliation"></i><%end%></li>
+  	<% end %>
+  	</l>
+  </div>
+  <script type="text/javascript">
+  	document.getElementById('affiliation-list-button').addEventListener('click', (e) => {
+  		const list = document.getElementById('affiliation-list')
+  		if (list.hasAttribute('hidden')) {
+	  		e.target.setAttribute('aria-expanded', 'true')
+  		} else {
+  			e.target.setAttribute('aria-expanded', 'false')
 	  	}
-	  	if (window.location.hash) openHash()
-	  	window.addEventListener('hashchange', openHash)
-	  </script>
-  <% end %>
+	  	e.target.lastElementChild?.classList.toggle('fa-caret-down')
+	  	e.target.lastElementChild?.classList.toggle('fa-caret-up')
+	  	list.toggleAttribute('hidden')
+  	})
+  	const openHash = () => {
+  		const hashed = document.getElementById(window.location.hash.substring(1))
+	    if (hashed.parentElement.hasAttribute('hidden')) {
+	    	document.getElementById('affiliation-list-button').click()
+	    }
+  	}
+  	if (window.location.hash) openHash()
+  	window.addEventListener('hashchange', openHash)
+  </script>
 <% end %>
diff --git a/db/data/20241022152849_add_corresp.rb b/db/data/20241022152849_add_corresp.rb
new file mode 100644
index 0000000000..d9d3c4e033
--- /dev/null
+++ b/db/data/20241022152849_add_corresp.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddCorresp < ActiveRecord::Migration[7.0]
+  def up
+    StashEngine::Author.where.not(author_email: [nil, '']).update_all(corresp: true)
+  end
+
+  def down
+    StashEngine::Author.update_all(corresp: false)
+  end
+end
diff --git a/db/migrate/20241022152550_add_corresp_and_org.rb b/db/migrate/20241022152550_add_corresp_and_org.rb
new file mode 100644
index 0000000000..6ad57a836e
--- /dev/null
+++ b/db/migrate/20241022152550_add_corresp_and_org.rb
@@ -0,0 +1,6 @@
+class AddCorrespAndOrg < ActiveRecord::Migration[7.0]
+  def change
+    add_column :stash_engine_authors, :corresp, :boolean, default: false
+    add_column :stash_engine_authors, :author_org_name, :string, limit: 255,  after: :author_last_name
+  end
+end
diff --git a/lib/datacite/mapping/datacite_xml_factory.rb b/lib/datacite/mapping/datacite_xml_factory.rb
index 5bc8c1127b..a14c32aef2 100644
--- a/lib/datacite/mapping/datacite_xml_factory.rb
+++ b/lib/datacite/mapping/datacite_xml_factory.rb
@@ -30,7 +30,10 @@ def build_resource(datacite_3: false) # rubocop:disable Metrics/AbcSize, Metrics
           identifier: Identifier.from_doi(doi_value),
           creators: se_resource.authors.map do |c|
             Creator.new(
-              name: c.author_full_name,
+              name: CreatorName.new(
+                value: c.author_full_name,
+                type: c.author_org_name.present? ? NameType::ORGANIZATIONAL : NameType::PERSONAL
+              ),
               identifier: dcs_identifier_from(c.author_orcid),
               affiliations: c.affiliations.map do |a|
                 if a.ror_id && !datacite_3
diff --git a/spec/factories/stash_engine/authors.rb b/spec/factories/stash_engine/authors.rb
index e76418b5f2..c7afb20ac8 100644
--- a/spec/factories/stash_engine/authors.rb
+++ b/spec/factories/stash_engine/authors.rb
@@ -8,6 +8,8 @@
 #  author_last_name   :string(191)
 #  author_orcid       :string(191)
 #  author_order       :integer
+#  author_org_name    :string(255)
+#  corresp            :boolean          default(FALSE)
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
 #  resource_id        :integer
diff --git a/spec/factories/stash_engine/resource_publications.rb b/spec/factories/stash_engine/resource_publications.rb
index 671fcfe19c..d8d7c817ed 100644
--- a/spec/factories/stash_engine/resource_publications.rb
+++ b/spec/factories/stash_engine/resource_publications.rb
@@ -14,10 +14,6 @@
 #
 #  index_stash_engine_resource_publications_on_resource_id  (resource_id) UNIQUE
 #
-# Foreign Keys
-#
-#  fk_rails_...  (resource_id => stash_engine_resources.id)
-#
 FactoryBot.define do
 
   factory :resource_publication, class: StashEngine::ResourcePublication do
diff --git a/spec/javascript/react/components/MetadataEntry/Authors/AuthorForm.test.js b/spec/javascript/react/components/MetadataEntry/Authors/AuthorForm.test.js
index 46093b525a..a8dd362cc3 100644
--- a/spec/javascript/react/components/MetadataEntry/Authors/AuthorForm.test.js
+++ b/spec/javascript/react/components/MetadataEntry/Authors/AuthorForm.test.js
@@ -12,6 +12,7 @@ const makeAuthor = (resource_id = null, author_order = null) => {
   return {
     author_first_name: faker.name.firstName(),
     author_last_name: faker.name.lastName(),
+    author_org_name: null,
     author_email: faker.internet.email(),
     author_orcid: `${sect()}-${sect()}-${sect()}-${sect()}`,
     resource_id: resource_id || faker.datatype.number({min: 1, max: 32767}),
@@ -31,14 +32,14 @@ describe('AuthorForm', () => {
   });
 
   it('renders the basic author form', () => {
-    render(<AuthorForm author={author} update={update} remove={remove} ownerId={ownerId} />);
+    render(<AuthorForm author={author} update={update} remove={remove} admin={false} ownerId={ownerId} />);
 
     const labeledElements = screen.getAllByLabelText('Institutional affiliation', {exact: false});
-    expect(labeledElements.length).toBe(2);
+    expect(labeledElements.length).toBe(1);
 
     expect(screen.getByLabelText('First name')).toHaveValue(author.author_first_name);
     expect(screen.getByLabelText('Last name')).toHaveValue(author.author_last_name);
-    expect(screen.getByLabelText('Author email')).toHaveValue(author.author_email);
+    expect(screen.getByLabelText('Email')).toHaveValue(author.author_email);
   });
 
   // gives some pointers and info about act and async examples
@@ -51,7 +52,7 @@ describe('AuthorForm', () => {
 
     axios.patch.mockImplementationOnce(() => promise);
 
-    render(<AuthorForm author={author} update={update} remove={remove} ownerId={ownerId} />);
+    render(<AuthorForm author={author} update={update} remove={remove} admin={false} ownerId={ownerId} />);
 
     userEvent.clear(screen.getByLabelText('First name'));
     userEvent.type(screen.getByLabelText('First name'), 'Alphred');
@@ -73,7 +74,7 @@ describe('AuthorForm', () => {
 
     axios.patch.mockImplementationOnce(() => promise);
 
-    render(<AuthorForm author={author} update={update} remove={remove} ownerId={ownerId} />);
+    render(<AuthorForm author={author} update={update} remove={remove} admin={false} ownerId={ownerId} />);
 
     userEvent.clear(screen.getByLabelText('Last name'));
     userEvent.type(screen.getByLabelText('Last name'), 'Dryadsson');
@@ -92,12 +93,12 @@ describe('AuthorForm', () => {
 
     axios.patch.mockImplementationOnce(() => promise);
 
-    render(<AuthorForm author={author} update={update} remove={remove} ownerId={ownerId} />);
+    render(<AuthorForm author={author} update={update} remove={remove} admin={false} ownerId={ownerId} />);
 
-    userEvent.clear(screen.getByLabelText('Author email'));
-    userEvent.type(screen.getByLabelText('Author email'), 'email@email.edu');
+    userEvent.clear(screen.getByLabelText('Email'));
+    userEvent.type(screen.getByLabelText('Email'), 'email@email.edu');
 
-    await waitFor(() => expect(screen.getByLabelText('Author email')).toHaveValue('email@email.edu'));
+    await waitFor(() => expect(screen.getByLabelText('Email')).toHaveValue('email@email.edu'));
 
     userEvent.tab(); // tab out of element, should trigger save on blur
 
diff --git a/spec/javascript/react/components/MetadataEntry/Authors/Authors.test.js b/spec/javascript/react/components/MetadataEntry/Authors/Authors.test.js
index f3ad4bba3d..d6458e7aec 100644
--- a/spec/javascript/react/components/MetadataEntry/Authors/Authors.test.js
+++ b/spec/javascript/react/components/MetadataEntry/Authors/Authors.test.js
@@ -13,6 +13,7 @@ const makeAuthor = (resource_id, myOrder) => {
     id: faker.datatype.number({min: 1, max: 32767}),
     author_first_name: faker.name.firstName(),
     author_last_name: faker.name.lastName(),
+    author_org_name: null,
     author_email: faker.internet.email(),
     author_orcid: `${sect()}-${sect()}-${sect()}-${sect()}`,
     resource_id: resource_id || faker.datatype.number({min: 1, max: 32767}),
@@ -40,7 +41,7 @@ describe('Authors', () => {
     render(<Authors resource={resource} setResource={setResource} ownerId={ownerId} admin={admin} />);
 
     const labeledElements = screen.getAllByLabelText('Institutional affiliation', {exact: false});
-    expect(labeledElements.length).toBe(6); // two for each autocomplete list
+    expect(labeledElements.length).toBe(3);
     const firsts = screen.getAllByLabelText('First name', {exact: false});
     expect(firsts.length).toBe(3);
     expect(firsts[0]).toHaveValue(dryadAuthors[2].author_first_name);
diff --git a/spec/javascript/react/components/MetadataEntry/Publication/Journal.test.js b/spec/javascript/react/components/MetadataEntry/Publication/Journal.test.js
index a1acd84b5b..f68a24385c 100644
--- a/spec/javascript/react/components/MetadataEntry/Publication/Journal.test.js
+++ b/spec/javascript/react/components/MetadataEntry/Publication/Journal.test.js
@@ -30,8 +30,8 @@ describe('Journal', () => {
 
     render(<Journal {...info} />);
 
-    const labeledElements = screen.getAllByLabelText(info.controlOptions.labelText, {exact: false});
-    expect(labeledElements.length).toBe(2);
+    const labeledElements = screen.getAllByLabelText(info.controlOptions.labelText);
+    expect(labeledElements.length).toBe(1);
     expect(labeledElements[0]).toHaveAttribute('value', title);
   });
 });
diff --git a/spec/javascript/react/components/MetadataEntry/Publication/PublicationForm.test.js b/spec/javascript/react/components/MetadataEntry/Publication/PublicationForm.test.js
index 7638db7502..42b73965d7 100644
--- a/spec/javascript/react/components/MetadataEntry/Publication/PublicationForm.test.js
+++ b/spec/javascript/react/components/MetadataEntry/Publication/PublicationForm.test.js
@@ -50,8 +50,8 @@ describe('PublicationFormManuscript', () => {
     render(<PublicationForm {...info} />);
 
     await waitFor(() => api);
-    const labeledElements = screen.getAllByLabelText('Journal name', {exact: false});
-    expect(labeledElements.length).toBe(2);
+    const labeledElements = screen.getAllByLabelText('Journal name');
+    expect(labeledElements.length).toBe(1);
     expect(labeledElements[0]).toHaveAttribute('value', resource_publication.publication_name);
     expect(screen.getByLabelText('Manuscript number')).toHaveValue(resource_publication.manuscript_number);
   });
@@ -129,8 +129,8 @@ describe('PublicationForm', () => {
     render(<PublicationForm {...info} />);
 
     await waitFor(() => api);
-    const labeledElements = screen.getAllByLabelText('Journal name', {exact: false});
-    expect(labeledElements.length).toBe(2);
+    const labeledElements = screen.getAllByLabelText('Journal name');
+    expect(labeledElements.length).toBe(1);
     expect(labeledElements[0]).toHaveAttribute('value', resource_publication.publication_name);
     expect(screen.getByLabelText('DOI')).toHaveValue(primary_article);
   });
diff --git a/spec/javascript/react/components/MetadataEntry/RorAutocomplete.test.js b/spec/javascript/react/components/MetadataEntry/RorAutocomplete.test.js
index c85bcfd44c..377a27ac44 100644
--- a/spec/javascript/react/components/MetadataEntry/RorAutocomplete.test.js
+++ b/spec/javascript/react/components/MetadataEntry/RorAutocomplete.test.js
@@ -27,7 +27,7 @@ describe('RorAutocomplete', () => {
 
     render(<RorAutocomplete {...info} />);
 
-    const labeledElements = screen.getAllByLabelText(info.controlOptions.labelText, {exact: false});
-    expect(labeledElements.length).toBe(2);
+    const labeledElements = screen.getAllByLabelText(info.controlOptions.labelText);
+    expect(labeledElements.length).toBe(1);
   });
 });
diff --git a/spec/javascript/react/components/MetadataEntry/Subjects/KeywordAutocomplete.test.js b/spec/javascript/react/components/MetadataEntry/Subjects/KeywordAutocomplete.test.js
index 07e0344188..7afa9cca96 100644
--- a/spec/javascript/react/components/MetadataEntry/Subjects/KeywordAutocomplete.test.js
+++ b/spec/javascript/react/components/MetadataEntry/Subjects/KeywordAutocomplete.test.js
@@ -18,7 +18,7 @@ describe('KeywordAutocomplete', () => {
   it('renders a basic autocomplete form', () => {
     render(<KeywordAutocomplete {...info} />);
 
-    const labeledElements = screen.getAllByLabelText(info.controlOptions.labelText, {exact: false});
-    expect(labeledElements.length).toBe(2);
+    const labeledElements = screen.getAllByLabelText(info.controlOptions.labelText);
+    expect(labeledElements.length).toBe(1);
   });
 });
diff --git a/spec/javascript/react/components/MetadataEntry/Subjects/Keywords.test.js b/spec/javascript/react/components/MetadataEntry/Subjects/Keywords.test.js
index 842eedbfa9..81992a2b97 100644
--- a/spec/javascript/react/components/MetadataEntry/Subjects/Keywords.test.js
+++ b/spec/javascript/react/components/MetadataEntry/Subjects/Keywords.test.js
@@ -57,7 +57,7 @@ describe('Keywords', () => {
 
     render(<Keywords resource={resource} setResource={setResource} />);
 
-    const input = screen.getByLabelText('Subject keywords', {exact: false});
+    const input = screen.getAllByLabelText('Subject keywords', {exact: false})[0];
     userEvent.type(input, 'Eco');
 
     await waitFor(() => options);
diff --git a/spec/javascript/react/components/MetadataEntry/Support/FunderForm.test.js b/spec/javascript/react/components/MetadataEntry/Support/FunderForm.test.js
index f607b18526..9262fb9528 100644
--- a/spec/javascript/react/components/MetadataEntry/Support/FunderForm.test.js
+++ b/spec/javascript/react/components/MetadataEntry/Support/FunderForm.test.js
@@ -41,7 +41,7 @@ describe('FunderForm', () => {
     render(<FunderForm {...info} />);
 
     const labeledElements = screen.getAllByLabelText('Granting organization', {exact: false});
-    expect(labeledElements.length).toBe(3);
+    expect(labeledElements.length).toBe(4);
     expect(labeledElements[0]).toHaveAttribute('value', info.contributor.contributor_name);
 
     expect(screen.getByLabelText('Award number')).toHaveValue(info.contributor.award_number);
diff --git a/spec/javascript/react/components/MetadataEntry/Support/Funders.test.js b/spec/javascript/react/components/MetadataEntry/Support/Funders.test.js
index 268af25c58..a6ba8cad34 100644
--- a/spec/javascript/react/components/MetadataEntry/Support/Funders.test.js
+++ b/spec/javascript/react/components/MetadataEntry/Support/Funders.test.js
@@ -44,8 +44,8 @@ describe('Funders', () => {
     render(<Funders resource={resource} setResource={setResource} />);
 
     await waitFor(() => options);
-    const labeledElements = screen.getAllByLabelText('Granting organization', {exact: false});
-    expect(labeledElements.length).toBe(9); // three for each autocomplete list
+    const labeledElements = screen.getAllByLabelText('Granting organization');
+    expect(labeledElements.length).toBe(3);
     const awardNums = screen.getAllByLabelText('Award number', {exact: false});
     expect(awardNums.length).toBe(3);
     expect(awardNums[0]).toHaveValue(contributors[0].award_number);
diff --git a/spec/javascript/react/components/UploadFiles/FileList/BadList.test.js b/spec/javascript/react/components/UploadFiles/FileList/BadList.test.js
index 0be1038cc4..e3d4312f4f 100644
--- a/spec/javascript/react/components/UploadFiles/FileList/BadList.test.js
+++ b/spec/javascript/react/components/UploadFiles/FileList/BadList.test.js
@@ -33,7 +33,7 @@ describe('BadList', () => {
     render(<BadList chosenFiles={testIssue} />);
 
     expect(screen.getByText(
-      'Our automated tabular data checker identified potential inconsistencies in the format and structure of 1 of your files.',
+      'Tabular data checker found inconsistencies in the format and structure of 1 of your files',
     )).toBeInTheDocument();
   });
 
@@ -47,7 +47,7 @@ describe('BadList', () => {
     render(<BadList chosenFiles={testFiles} />);
 
     expect(screen.queryByText(
-      'Our automated tabular data checker identified potential inconsistencies in the format and structure of 1 of your files.',
+      'Tabular data checker found inconsistencies in the format and structure of 1 of your files',
     )).not.toBeInTheDocument();
   });
 
@@ -64,7 +64,7 @@ describe('BadList', () => {
     render(<BadList chosenFiles={testFiles} />);
 
     expect(screen.queryByText(
-      'Our automated tabular data checker identified potential inconsistencies in the format and structure of 1 of your files.',
+      'Tabular data checker found inconsistencies in the format and structure of 1 of your files',
     )).not.toBeInTheDocument();
   });
 });
diff --git a/spec/models/stash_datacite/author_spec.rb b/spec/models/stash_datacite/author_spec.rb
index 2fad1ea10a..d66535187e 100644
--- a/spec/models/stash_datacite/author_spec.rb
+++ b/spec/models/stash_datacite/author_spec.rb
@@ -53,11 +53,11 @@ module StashEngine # TODO: are we testing Author or Affiliation? (Or AuthorPatch
       end
 
       describe '#affiliation=' do
-        it 'replaces the entire affiliation list' do
+        it 'does not replace the entire affiliation list' do
+          count = @author.affiliations.count
           new_affil = StashDatacite::Affiliation.create(long_name: 'Metro-Goldwyn-Mayer')
           @author.affiliation = new_affil
-          expect(@author.affiliations.count).to eq(1)
-          expect(@author.affiliation).to eq(new_affil)
+          expect(@author.affiliations.count).to eq(count + 1)
         end
       end
 
diff --git a/spec/models/stash_datacite/dataset_validations_spec.rb b/spec/models/stash_datacite/dataset_validations_spec.rb
index e7638af413..14560f9a41 100644
--- a/spec/models/stash_datacite/dataset_validations_spec.rb
+++ b/spec/models/stash_datacite/dataset_validations_spec.rb
@@ -51,14 +51,14 @@ module Resource
       end
 
       describe :authors do
-        it 'returns error for missing first or last name' do
+        it 'returns error for missing firstname' do
           @author2.update(author_first_name: '')
           validations = DatasetValidations.new(resource: @resource)
           errors = validations.authors
           error = errors.first
           expect(errors.count).to eq(1)
           expect(error.message).to include('2nd')
-          expect(error.message).to include('first and last name')
+          expect(error.message).to include('first name')
           expect(error.ids.first).to include('author_first_name__')
         end
 
diff --git a/spec/models/stash_engine/author_spec.rb b/spec/models/stash_engine/author_spec.rb
index 7e266ce821..41653d40a7 100644
--- a/spec/models/stash_engine/author_spec.rb
+++ b/spec/models/stash_engine/author_spec.rb
@@ -8,6 +8,8 @@
 #  author_last_name   :string(191)
 #  author_orcid       :string(191)
 #  author_order       :integer
+#  author_org_name    :string(255)
+#  corresp            :boolean          default(FALSE)
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
 #  resource_id        :integer