diff --git a/TODO.txt b/TODO.txt
index eb767f2d..bdf368a9 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -162,6 +162,16 @@ M When import story form, hundreds of triples can be generated which take minute
 
 ==== DONE
 
+-- Release 1.5.18
+
+Added: Validation check to make sure that all questions have types.
+Added: Validation check to make sure that questions of types that require answer lists (select, radiobuttons, checkboxes) have answer lists. 
+Added: For validation support, if you are editing a list item and you click a page-change button, a message will appear asking you to close the currently open item first. (NF needs you to do this so it can run its validation checks.)
+Added: Global error pop-up that shows the same message as is posted to the development console (for those who don't know about or can't find the development console).
+Changed: Improved error reporting when questions that should have but are missing answer lists are imported from CSV.
+Changed: Improved error message in survey itself when a question that requires an answer list has no answer list. 
+Changed: NF's HTML cleanup process has always interpreted a single angle bracket (<) as the start of an HTML tag (and showed an error if there is no closing bracket). This is a problem for texts like "<25" (an age bracket). Now NF just prints out the < and lets you figure out if it's an incomplete HTML tag. 
+
 -- Release 1.5.17
 
 Fixed: Broken link on several help pages.
diff --git a/package.json b/package.json
index 0948248d..d1459f5d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "NarraFirma",
   "description": "NarraFirma webapp for Participatory Narrative Inquiry (PNI)",
-  "version": "1.5.17",
+  "version": "1.5.18",
   "keywords": [
     "JavaScript",
     "NarraFirma",
diff --git a/webapp/source/versions.ts b/webapp/source/versions.ts
index ea0c49d7..9abf5cd5 100644
--- a/webapp/source/versions.ts
+++ b/webapp/source/versions.ts
@@ -3,7 +3,7 @@ import kludgeForUseStrict = require("./kludgeForUseStrict");
 
 // Return current versions used by application  
 const versions = {
-    narrafirmaApplication: "1.5.17",
+    narrafirmaApplication: "1.5.18",
     
     questionnaireContentType: "org.workingwithstories.NarraFirmaQuestionnaire",
     questionnaireContentVersion: "0.2.0",
diff --git a/wordpress-plugin/narrafirma/narrafirma.php b/wordpress-plugin/narrafirma/narrafirma.php
index 2ecf56f4..548cfc25 100644
--- a/wordpress-plugin/narrafirma/narrafirma.php
+++ b/wordpress-plugin/narrafirma/narrafirma.php
@@ -4,7 +4,7 @@
 Plugin URI: http://narrafirma.com
 Description: Participatory Narrative Inquiry in a box. Gather stories and make sense of challenges and opportunities in your community or organization.
 Author: Cynthia F. Kurtz and Paul D. Fernhout
-Version: 1.5.17
+Version: 1.5.18
 Author URI: http://cfkurtz.com
 License: GPLv2 or later
 */
@@ -29,7 +29,7 @@
 
 defined( 'ABSPATH' ) or die( 'Plugin must be run from inside WordPress' );
 
-$NARRAFIRMA_VERSION = '1.5.17';
+$NARRAFIRMA_VERSION = '1.5.18';
 
 $pointrelServerVersion = "pointrel20150417-0.0.4-wp";
 
diff --git a/wordpress-plugin/narrafirma/readme.txt b/wordpress-plugin/narrafirma/readme.txt
index d96b7500..54e0c022 100644
--- a/wordpress-plugin/narrafirma/readme.txt
+++ b/wordpress-plugin/narrafirma/readme.txt
@@ -9,7 +9,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Requires at least: 4.3.1
 Tested up to: 6.0.3
 Stable tag: trunk
-Version: 1.5.17
+Version: 1.5.18
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -106,7 +106,17 @@ We strongly suggest that you set up any web site on which you intend to install
 
 == Changelog ==
 
-= 1.5.17 -
+= 1.5.18 =
+
+Added: Validation check to make sure that all questions have types.
+Added: Validation check to make sure that questions of types that require answer lists (select, radiobuttons, checkboxes) have answer lists. 
+Added: For validation support, if you are editing a list item and you click a page-change button, a message will appear asking you to close the currently open item first. (NF needs you to do this so it can run its validation checks.)
+Added: Global error pop-up that shows the same message as is posted to the development console (for those who don't know about or can't find the development console).
+Changed: Improved error reporting when questions that should have but are missing answer lists are imported from CSV.
+Changed: Improved error message in survey itself when a question that requires an answer list has no answer list. 
+Changed: NF's HTML cleanup process has always interpreted a single angle bracket (<) as the start of an HTML tag (and showed an error if there is no closing bracket). This is a problem for texts like "<25" (an age bracket). Now NF just prints out the < and lets you figure out if it's an incomplete HTML tag. 
+
+= 1.5.17 =
 
 Fixed: Broken link on several help pages.
 
@@ -595,6 +605,10 @@ change logs, see the [GitHub repository](https://github.com/pdfernhout/narrafirm
 
 == Upgrade Notice ==
 
+= 1.5.18 =
+
+This minor upgrade helps NF deal more gracefully with information users sometimes forget to provide. It also improves general error reporting.
+
 = 1.5.17 =
 
 This tiny upgrade fixes several broken links on help pages.