diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini
index 449a33d..ca9edb2 100644
--- a/calibre-plugin/plugin-defaults.ini
+++ b/calibre-plugin/plugin-defaults.ini
@@ -383,11 +383,11 @@ tagsfromtitle_label:Tags from Title
 ## also often include non-category stuff.
 # include_in_category:tagsfromtitle 
 
-include_metadata_pre:
+add_to_include_metadata_pre:
 # only keep tagsfromtitle with ( or [ in.
  tagsfromtitle=~[\[\(]
  
-replace_metadata:
+add_to_replace_metadata:
 # remove anything outside () or []
  tagsfromtitle=>^.*?([\(\[]([^\]\)]+)[\)\]]).*?$=>\1
 # remove () []
@@ -402,7 +402,7 @@ replace_metadata:
 # four", "Thread iv", etc
  title=>[-: ]*[Tt]hread [^ ]+[-: ]*=>
 
-extra_titlepage_entries: tagsfromtitle
+add_to_extra_titlepage_entries:,tagsfromtitle
 
 ## '.SPLIT' tells the system to split by ','
 add_to_include_subject_tags:,tagsfromtitle.SPLIT
@@ -665,6 +665,8 @@ extratags: FanFiction,Testing,HTML
 ## doesn't like that.  If do_update_hook is uncommented and set true,
 ## the adapter will discard all existing chapters from the newest one
 ## on when updating to enforce accurate chapters.
+## Starting July 2015, FFF stores chapter URLs in the chapter files.
+## Stories downloaded after that shouldn't need this setting anymore.
 #do_update_hook:false
 
 ## AO3 adapter defines a few extra metadata entries.
diff --git a/fanficfare/cli.py b/fanficfare/cli.py
index d1ecefd..2291d12 100644
--- a/fanficfare/cli.py
+++ b/fanficfare/cli.py
@@ -135,7 +135,7 @@ def main(argv=None, parser=None, passed_defaultsini=None, passed_personalini=Non
         parser.error('-u/--update-epub only works with epub')
 
     if options.unnew and options.format != 'epub':
-        parser.error('--unnew-epub only works with epub')
+        parser.error('--unnew only works with epub')
 
     # for passing in a file list
     if options.infile:
diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py
index f38f474..97fc399 100644
--- a/fanficfare/configurable.py
+++ b/fanficfare/configurable.py
@@ -213,8 +213,11 @@ def get_valid_keywords():
                  'bulk_load',
                  'chapter_end',
                  'chapter_start',
-                 'chapter_title_add_pattern',
                  'chapter_title_strip_pattern',
+                 'chapter_title_def_pattern',
+                 'chapter_title_add_pattern',
+                 'chapter_title_new_pattern',
+                 'chapter_title_addnew_pattern',
                  'mark_new_chapters',
                  'check_next_chapter',
                  'skip_author_cover',
diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini
index e1ceed6..ab2a662 100644
--- a/fanficfare/defaults.ini
+++ b/fanficfare/defaults.ini
@@ -380,11 +380,11 @@ tagsfromtitle_label:Tags from Title
 ## also often include non-category stuff.
 # include_in_category:tagsfromtitle 
 
-include_metadata_pre:
+add_to_include_metadata_pre:
 # only keep tagsfromtitle with ( or [ in.
  tagsfromtitle=~[\[\(]
  
-replace_metadata:
+add_to_replace_metadata:
 # remove anything outside () or []
  tagsfromtitle=>^.*?([\(\[]([^\]\)]+)[\)\]]).*?$=>\1
 # remove () []
@@ -399,7 +399,7 @@ replace_metadata:
 # four", "Thread iv", etc
  title=>[-: ]*[Tt]hread [^ ]+[-: ]*=>
 
-extra_titlepage_entries: tagsfromtitle
+add_to_extra_titlepage_entries:,tagsfromtitle
 
 ## '.SPLIT' tells the system to split by ','
 add_to_include_subject_tags:,tagsfromtitle.SPLIT
@@ -669,6 +669,8 @@ extratags: FanFiction,Testing,HTML
 ## doesn't like that.  If do_update_hook is uncommented and set true,
 ## the adapter will discard all existing chapters from the newest one
 ## on when updating to enforce accurate chapters.
+## Starting July 2015, FFF stores chapter URLs in the chapter files.
+## Stories downloaded after that shouldn't need this setting anymore.
 #do_update_hook:false
 
 ## AO3 adapter defines a few extra metadata entries.