diff --git a/defaults.ini b/defaults.ini
index e31349c..2f55369 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -538,6 +538,13 @@ extratags: FanFiction,Testing,HTML
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## archiveofourown.org stories allow chapters to be added out of
+## order.  So the newest chapter may not be the last one.  FFDL update
+## 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.
+#do_update_hook:false
+
 ## AO3 adapter defines a few extra metadata entries.
 ## If there's ever more than 4 series, add series04,series04Url etc.
 extra_valid_entries:fandoms,freeformtags,freefromtags,ao3categories,comments,kudos,hits,bookmarks,collections,series00,series01,series02,series03,series00Url,series01Url,series02Url,series03Url
@@ -562,11 +569,6 @@ include_in_freefromtags:freeformtags
 #extra_subject_tags:fandoms,freeformtags,ao3categories
 
 [ashwinder.sycophanthex.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extracharacters:Severus Snape,Hermione Granger
-extraships:Severus Snape/Hermione Granger
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -574,6 +576,11 @@ extraships:Severus Snape/Hermione Granger
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape,Hermione Granger
+extraships:Severus Snape/Hermione Granger
+
 [asr3.slashzone.org]
 ## Site dedicated to these categories/characters/ships
 extracategories:The Sentinel
@@ -584,9 +591,6 @@ extracategories:The Sentinel
 #is_adult:true
 
 [bloodties-fans.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Blood Ties
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -599,6 +603,9 @@ extracategories:Blood Ties
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Blood Ties
+
 [buffynfaith.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:Buffy: The Vampire Slayer
@@ -609,9 +616,6 @@ extracategories:Buffy: The Vampire Slayer
 #is_adult:true
 
 [castlefans.org]
-## Site dedicated to these categories/characters/ships
-extracategories:Castle
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -624,6 +628,9 @@ extracategories:Castle
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Castle
+
 [chaos.sycophanthex.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
@@ -636,10 +643,23 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 
 [dark-solace.org]
 ## Site dedicated to these categories/characters/ships
+## Some sites require login (or login for some rated stories) The
+## program can prompt you, or you can save it in config.  In
+## commandline version, this should go in your personal.ini, not
+## defaults.ini.
+#username:YourName
+#password:yourpassword
+
+## Some sites also require the user to confirm they are adult for
+## adult content.  In commandline version, this should go in your
+## personal.ini, not defaults.ini.
+#is_adult:true
+
 extracategories:Buffy: The Vampire Slayer
 extracharacters:Buffy, Spike
 extraships:Spike/Buffy
 
+[dramione.org]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -652,24 +672,11 @@ extraships:Spike/Buffy
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-[dramione.org]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 extracharacters:Draco Malfoy,Hermione Granger
 extraships:Draco Malfoy/Hermione Granger
 
-## Some sites require login (or login for some rated stories) The
-## program can prompt you, or you can save it in config.  In
-## commandline version, this should go in your personal.ini, not
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## Some sites also require the user to confirm they are adult for
-## adult content.  In commandline version, this should go in your
-## personal.ini, not defaults.ini.
-#is_adult:true
-
 ## some sites include images that we don't ever want becoming the
 ## cover image.  This lets you exclude them.
 cover_exclusion_regexp:/images/.*?ribbon.gif
@@ -712,22 +719,19 @@ cliches_label:Character Cliches
 extracategories:Lord of the Rings
 
 [erosnsappho.sycophanthex.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## some sites include images that we don't ever want becoming the
 ## cover image.  This lets you exclude them.
 cover_exclusion_regexp:/images/.*?ribbon.gif
 
 [fanfiction.mugglenet.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -740,10 +744,10 @@ extracategories:Harry Potter
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [fanfic.potterheadsanonymous.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -756,16 +760,19 @@ extracategories:Harry Potter
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [fanfiction.portkey.org]
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 extraships:Harry Potter/Hermione Granger
 
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.  In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
 [fanfiction.tenhawkpresents.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -818,10 +825,6 @@ universe_label:Universe
 codes_label:Codes
 
 [grangerenchanted.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extracharacters:Hermione Granger
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -834,6 +837,10 @@ extracharacters:Hermione Granger
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Hermione Granger
+
 ## Extra metadata that this adapter knows about.  See [dramione.org]
 ## for examples of how to use them.
 extra_valid_entries:read,reviews
@@ -870,18 +877,15 @@ extracharacters:Kirk,Spock
 extraships:Kirk/Spock
 
 [lumos.sycophanthex.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[merlinfic.dtwins.co.uk]
 ## Site dedicated to these categories/characters/ships
-extracategories:Merlin
+extracategories:Harry Potter
 
+[merlinfic.dtwins.co.uk]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -894,6 +898,9 @@ extracategories:Merlin
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Merlin
+
 [national-library.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:West Wing
@@ -905,24 +912,32 @@ extracategories:NCIS
 [netraptor.org]
 
 [nfacommunity.com]
-## Site dedicated to these categories/characters/ships
-extracategories:NCIS
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:NCIS
+
 [nha.magical-worlds.us]
 ## Site dedicated to these categories/characters/ships
 extracategories:Buffy: The Vampire Slayer
 extracharacters:Willow
 
 [occlumency.sycophanthex.com]
+## Some sites require login (or login for some rated stories) The
+## program can prompt you, or you can save it in config.  In
+## commandline version, this should go in your personal.ini, not
+## defaults.ini.
+#username:YourName
+#password:yourpassword
+
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 extracharacters:Severus Snape
 
+[onedirectionfanfiction.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -930,10 +945,15 @@ extracharacters:Severus Snape
 #username:YourName
 #password:yourpassword
 
-[onedirectionfanfiction.com]
+## Some sites also require the user to confirm they are adult for
+## adult content.  In commandline version, this should go in your
+## personal.ini, not defaults.ini.
+#is_adult:true
+
 ## Site dedicated to these categories/characters/ships
 extracategories:One Direction
 
+[pommedesang.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -946,40 +966,27 @@ extracategories:One Direction
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-[pommedesang.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:Anita Blake Vampire Hunter 
 
-## Some sites require login (or login for some rated stories) The
-## program can prompt you, or you can save it in config.  In
-## commandline version, this should go in your personal.ini, not
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## Some sites also require the user to confirm they are adult for
-## adult content.  In commandline version, this should go in your
-## personal.ini, not defaults.ini.
+[ponyfictionarchive.net]
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[ponyfictionarchive.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:My Little Pony: Friendship is Magic
 
+[pretendercentre.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[pretendercentre.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:The Pretender
 
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.  In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
 [samdean.archive.nu]
 ## Site dedicated to these categories/characters/ships
 extracategories:Supernatural
@@ -987,9 +994,6 @@ extracharacters:Sam,Dean
 extraships:Sam/Dean
 
 [scarhead.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1002,6 +1006,9 @@ extracategories:Harry Potter
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [sg1-heliopolis.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
@@ -1032,9 +1039,6 @@ extracharacters:Draco Malfoy,Harry Potter
 extraships:Harry Potter/Draco Malfoy
 
 [thehookupzone.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Criminal Minds
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1047,6 +1051,9 @@ extracategories:Criminal Minds
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Criminal Minds
+
 [themasque.net]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -1061,9 +1068,6 @@ extracategories:Criminal Minds
 #is_adult:true
 
 [thequidditchpitch.org]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1076,19 +1080,19 @@ extracategories:Harry Potter
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-[tokra.fandomnet.com]
 ## Site dedicated to these categories/characters/ships
-extracategories:Stargate: SG-1
+extracategories:Harry Potter
 
+[tokra.fandomnet.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[trekiverse.org]
 ## Site dedicated to these categories/characters/ships
-extracategories:Star Trek
+extracategories:Stargate: SG-1
 
+[trekiverse.org]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1101,26 +1105,24 @@ extracategories:Star Trek
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Star Trek
+
 extra_valid_entries:awards
 awards_label:Awards
 
 cover_exclusion_regexp:art/.*Awards.jpg
 
 [www.adastrafanfic.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Star Trek
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[www.dracoandginny.com]
 ## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extracharacters:Draco Malfoy,Ginny Weasley
-extraships:Draco Malfoy/Ginny Weasley
+extracategories:Star Trek
 
+[www.dracoandginny.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1133,14 +1135,16 @@ extraships:Draco Malfoy/Ginny Weasley
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Draco Malfoy,Ginny Weasley
+extraships:Draco Malfoy/Ginny Weasley
+
 [www.thealphagate.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:Stargate: SG-1
 
 [www.checkmated.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1148,6 +1152,9 @@ extracategories:Harry Potter
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [www.destinysgateway.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
@@ -1155,11 +1162,6 @@ extracategories:Harry Potter
 #is_adult:true
 
 [www.dokuga.com]
-## Site dedicated to these categories/characters/ships
-extracategories:InuYasha
-extracharacters:Sesshoumaru,Kagome
-extraships:Sesshoumaru/Kagome
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1167,6 +1169,11 @@ extraships:Sesshoumaru/Kagome
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:InuYasha
+extracharacters:Sesshoumaru,Kagome
+extraships:Sesshoumaru/Kagome
+
 [www.dotmoon.net]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -1222,14 +1229,14 @@ dateUpdated_format:%%Y-%%m-%%d %%H:%%M:%%S
 [www.ficbook.net]
 
 [www.fictionalley.org]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## fictionally.org storyIds are not unique.  Combine with authorId.
 output_filename: ${title}-${siteabbrev}_${authorId}_${storyId}${formatext}
 
@@ -1255,6 +1262,23 @@ extra_valid_entries:reviews,favs,follows
 #password:yourpassword
 
 [www.fimfiction.net]
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
+## fimfiction.net stories can be locked requiring individual
+## passwords.  If fail_on_password is set, the downloader will fail
+## when a password is required rather than prompting every time.
+#fail_on_password: false
+
+## fimfiction.net stories allow chapters to be added out of order.  So
+## the newest chapter may not be the last one.  FFDL update 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.
+#do_update_hook:false
+
 ## Site dedicated to these categories/characters/ships
 extracategories:My Little Pony: Friendship is Magic
 
@@ -1285,55 +1309,33 @@ keep_in_order_groupsUrl:true
 ## make entryHTML.
 make_linkhtml_entries:prequel,sequels,groups
 
+[www.harrypotterfanfiction.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-## fimfiction.net stories can be locked requiring individual
-## passwords.  If fail_on_password is set, the downloader will fail
-## when a password is required rather than prompting every time.
-#fail_on_password: false
-
-## fimfiction.net stories allow chapters to be added out of order.  So
-## the newest chapter may not be the last one.  FFDL update 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.
-#do_update_hook:false
-
-[www.harrypotterfanfiction.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.  In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
 [www.henneth-annun.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:The Hobbit
 
 [www.hpfandom.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [www.hpfanficarchive.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 
 [www.ik-eternal.net]
-## Site dedicated to these categories/characters/ships
-extracategories:InuYasha
-extracharacters:InuYasha,Kagome
-extraships:InuYasha/Kagome
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1346,30 +1348,35 @@ extraships:InuYasha/Kagome
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:InuYasha
+extracharacters:InuYasha,Kagome
+extraships:InuYasha/Kagome
+
 [www.jlaunlimited.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:JLA
 
 [www.libraryofmoria.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Lord of the Rings
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Lord of the Rings
+
 [www.mediaminer.org]
 
 [www.midnightwhispers.ca]
-## Site dedicated to these categories/characters/ships
-extracategories:Queer as Folk
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Queer as Folk
+
 ## some sites include images that we don't ever want becoming the
 ## cover image.  This lets you exclude them.
 cover_exclusion_regexp:/stories/999/images/.*?_trophy.png
@@ -1384,10 +1391,6 @@ extracategories:CSI
 extraships:Nick Stokes/Greg Sanders
 
 [www.phoenixsong.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extraships:Harry Potter/Ginny Weasley
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1398,9 +1401,13 @@ extraships:Harry Potter/Ginny Weasley
 ## phoenixsong.net, oddly, can have high rated chapters (login
 ## required) in the middle of a lower rated story.  Use this to force
 ## FFDL to always login to phoenixsong.net so those stories download
-## correctly.
+## correctly.  If you have a login, this is recommended.
 #force_login:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extraships:Harry Potter/Ginny Weasley
+
 [www.potionsandsnitches.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
@@ -1423,17 +1430,15 @@ extracategories:Psych
 #is_adult:true
 
 [www.qaf-fic.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Queer as Folk
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Queer as Folk
+
 [www.restrictedsection.org]
-extracategories:Harry Potter
-extragenres:Erotica
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1441,20 +1446,21 @@ extragenres:Erotica
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extragenres:Erotica
+
 [www.scarvesandcoffee.net]
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
 ## Site dedicated to these categories/characters/ships
 extracategories:Glee
 extracharacters:Kurt Hummel,Blaine Anderson
 
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.  In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
 [www.simplyundeniable.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1462,15 +1468,18 @@ extracategories:Harry Potter
 #username:YourName
 #password:yourpassword
 
-[www.sinful-desire.org]
 ## Site dedicated to these categories/characters/ships
-extracategories:Supernatural
+extracategories:Harry Potter
 
+[www.sinful-desire.org]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Supernatural
+
 [www.siye.co.uk]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
@@ -1478,25 +1487,26 @@ extracharacters:Harry Potter,Ginny Weasley
 extraships:Harry Potter/Ginny Weasley
 
 [www.squidge.org/peja]
-# www.squidge.org/peja calls it Fandom <shrug>
+## www.squidge.org/peja calls it Fandom <shrug>
 category_label:Fandom
-# Remove numWords -- www.squidge.org/peja word counts are inaccurate
+
+## Remove numWords -- www.squidge.org/peja word counts are inaccurate
 titlepage_entries: seriesHTML,category,genre,language,characters,ships,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description
 
 [www.squidge.org/peja:txt]
-## Add URLs since there aren't links.
-# Remove numWords -- www.squidge.org/peja word counts are inaccurate
+## Add URLs since there aren't links and remove numWords --
+## www.squidge.org/peja word counts are inaccurate
 titlepage_entries: series,seriesUrl,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description
 
 [www.storiesofarda.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Lord of the Rings
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Lord of the Rings
+
 [www.thepetulantpoetess.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -1539,9 +1549,6 @@ collect_series: false
 extracategories:Twilight
 
 [www.twilighted.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Twilight
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1549,13 +1556,13 @@ extracategories:Twilight
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight
+
 ## twilighted.net (ab)uses series as personal reading lists.
 collect_series: false
 
 [www.twiwrite.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Twilight
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1563,20 +1570,23 @@ extracategories:Twilight
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight
+
 ## twiwrite.net (ab)uses series as personal reading lists.
 collect_series: false
 
 [www.walkingtheplank.org]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extracharacters:Severus Snape,Harry Potter
-extraships:Severus Snape/Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape,Harry Potter
+extraships:Severus Snape/Harry Potter
+
 [www.whofic.com]
 
 [www.wizardtales.net]
@@ -1598,14 +1608,14 @@ extracategories:X-Men Movie
 extracharacters:Wolverine,Rogue
 
 [www.wraithbait.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Stargate: Atlantis
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Stargate: Atlantis
+
 [overrides]
 ## It may sometimes be useful to override all of the specific format,
 ## site and site:format sections in your private configuration.  For
diff --git a/fanficdownloader/adapters/adapter_archiveofourownorg.py b/fanficdownloader/adapters/adapter_archiveofourownorg.py
index 368c9f9..2d93302 100644
--- a/fanficdownloader/adapters/adapter_archiveofourownorg.py
+++ b/fanficdownloader/adapters/adapter_archiveofourownorg.py
@@ -177,19 +177,28 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter):
                 self.story.addToList('authorUrl','http://'+self.host+a['href'])
                 self.story.addToList('author',a.text)
 
+        newestChapter = None
+        self.newestChapterNum = None # save for comparing during update.
+        # Scan all chapters to find the oldest and newest, on AO3 it's
+        # possible for authors to insert new chapters out-of-order or
+        # change the dates of earlier ones by editing them--That WILL
+        # break epub update.
         # Find the chapters:
         chapters=soup.findAll('a', href=re.compile(r'/works/'+self.story.getMetadata('storyId')+"/chapters/\d+$"))
         self.story.setMetadata('numChapters',len(chapters))
         logger.debug("numChapters: (%s)"%self.story.getMetadata('numChapters'))
-        for x in range(0,len(chapters)):
-            # just in case there's tags, like <i> in chapter titles.
-            chapter=chapters[x]
-            if len(chapters)==1:
-                self.chapterUrls.append((self.story.getMetadata('title'),'http://'+self.host+chapter['href']+addurl))
-            else:
+        if len(chapters)==1:
+            self.chapterUrls.append((self.story.getMetadata('title'),'http://'+self.host+chapter['href']+addurl))
+        else:
+            for index, chapter in enumerate(chapters):
+                # strip just in case there's tags, like <i> in chapter titles.
                 self.chapterUrls.append((stripHTML(chapter),'http://'+self.host+chapter['href']+addurl))
-
-
+                # (2013-09-21)
+                date = stripHTML(chapter.findNext('span'))[1:-1]
+                chapterDate = makeDate(date,self.dateformat)
+                if newestChapter == None or chapterDate > newestChapter:
+                    newestChapter = chapterDate
+                    self.newestChapterNum = index
 
         a = metasoup.find('blockquote',{'class':'userstuff'})
         if a != None:
@@ -299,6 +308,12 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter):
                     self.setSeries(series_name, series_index)
                     self.story.setMetadata('seriesUrl',series_url)
 
+    def hookForUpdates(self,chaptercount):
+        if self.oldchapters and len(self.oldchapters) > self.newestChapterNum:
+            print("Existing epub has %s chapters\nNewest chapter is %s.  Discarding old chapters from there on."%(len(self.oldchapters), self.newestChapterNum+1))
+            self.oldchapters = self.oldchapters[:self.newestChapterNum]
+        return len(self.oldchapters)
+            
     # grab the text for an individual chapter.
     def getChapterText(self, url):
         logger.debug('Getting chapter text from: %s' % url)
diff --git a/fanficdownloader/adapters/adapter_trekiverseorg.py b/fanficdownloader/adapters/adapter_trekiverseorg.py
index 58852aa..aa53e2e 100644
--- a/fanficdownloader/adapters/adapter_trekiverseorg.py
+++ b/fanficdownloader/adapters/adapter_trekiverseorg.py
@@ -65,12 +65,16 @@ class TrekiverseOrgAdapter(BaseSiteAdapter):
         # The site domain.
         return 'trekiverse.org'
 
+    @classmethod
+    def getAcceptDomains(cls):
+        return ['trekiverse.org','efiction.trekiverse.org']
+
     @classmethod
     def getSiteExampleURLs(self):
-        return "http://"+self.getSiteDomain()+"/efiction/viewstory.php?sid=1234"
+        return "http://"+self.getSiteDomain()+"/efiction/viewstory.php?sid=1234 http://efiction."+self.getSiteDomain()+"/viewstory.php?sid=1234"
 
     def getSiteURLPattern(self):
-        return r'http://trekiverse\.org/efiction/viewstory\.php\?sid=\d+'
+        return r'(http://trekiverse\.org/efiction/viewstory\.php\?sid=\d+|http://efiction\.trekiverse\.org/viewstory\.php\?sid=\d+)'
        
     ## Login seems to be reasonably standard across eFiction sites.
     def needToLoginCheck(self, data):
diff --git a/plugin-defaults.ini b/plugin-defaults.ini
index 40f0217..b5da284 100644
--- a/plugin-defaults.ini
+++ b/plugin-defaults.ini
@@ -507,6 +507,13 @@ extratags: FanFiction,Testing,HTML
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## archiveofourown.org stories allow chapters to be added out of
+## order.  So the newest chapter may not be the last one.  FFDL update
+## 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.
+#do_update_hook:false
+
 ## AO3 adapter defines a few extra metadata entries.
 ## If there's ever more than 4 series, add series04,series04Url etc.
 extra_valid_entries:fandoms,freeformtags,freefromtags,ao3categories,comments,kudos,hits,bookmarks,collections,series00,series01,series02,series03,series00Url,series01Url,series02Url,series03Url
@@ -531,11 +538,6 @@ include_in_freefromtags:freeformtags
 #extra_subject_tags:fandoms,freeformtags,ao3categories
 
 [ashwinder.sycophanthex.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extracharacters:Severus Snape,Hermione Granger
-extraships:Severus Snape/Hermione Granger
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -543,6 +545,11 @@ extraships:Severus Snape/Hermione Granger
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape,Hermione Granger
+extraships:Severus Snape/Hermione Granger
+
 [asr3.slashzone.org]
 ## Site dedicated to these categories/characters/ships
 extracategories:The Sentinel
@@ -553,9 +560,6 @@ extracategories:The Sentinel
 #is_adult:true
 
 [bloodties-fans.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Blood Ties
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -568,6 +572,9 @@ extracategories:Blood Ties
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Blood Ties
+
 [buffynfaith.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:Buffy: The Vampire Slayer
@@ -578,9 +585,6 @@ extracategories:Buffy: The Vampire Slayer
 #is_adult:true
 
 [castlefans.org]
-## Site dedicated to these categories/characters/ships
-extracategories:Castle
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -593,6 +597,9 @@ extracategories:Castle
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Castle
+
 [chaos.sycophanthex.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
@@ -605,10 +612,23 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 
 [dark-solace.org]
 ## Site dedicated to these categories/characters/ships
+## Some sites require login (or login for some rated stories) The
+## program can prompt you, or you can save it in config.  In
+## commandline version, this should go in your personal.ini, not
+## defaults.ini.
+#username:YourName
+#password:yourpassword
+
+## Some sites also require the user to confirm they are adult for
+## adult content.  In commandline version, this should go in your
+## personal.ini, not defaults.ini.
+#is_adult:true
+
 extracategories:Buffy: The Vampire Slayer
 extracharacters:Buffy, Spike
 extraships:Spike/Buffy
 
+[dramione.org]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -621,24 +641,11 @@ extraships:Spike/Buffy
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-[dramione.org]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 extracharacters:Draco Malfoy,Hermione Granger
 extraships:Draco Malfoy/Hermione Granger
 
-## Some sites require login (or login for some rated stories) The
-## program can prompt you, or you can save it in config.  In
-## commandline version, this should go in your personal.ini, not
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## Some sites also require the user to confirm they are adult for
-## adult content.  In commandline version, this should go in your
-## personal.ini, not defaults.ini.
-#is_adult:true
-
 ## some sites include images that we don't ever want becoming the
 ## cover image.  This lets you exclude them.
 cover_exclusion_regexp:/images/.*?ribbon.gif
@@ -697,22 +704,19 @@ cliches_label:Character Cliches
 extracategories:Lord of the Rings
 
 [erosnsappho.sycophanthex.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## some sites include images that we don't ever want becoming the
 ## cover image.  This lets you exclude them.
 cover_exclusion_regexp:/images/.*?ribbon.gif
 
 [fanfiction.mugglenet.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -725,10 +729,10 @@ extracategories:Harry Potter
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [fanfic.potterheadsanonymous.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -741,16 +745,19 @@ extracategories:Harry Potter
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [fanfiction.portkey.org]
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 extraships:Harry Potter/Hermione Granger
 
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.  In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
 [fanfiction.tenhawkpresents.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -803,10 +810,6 @@ universe_label:Universe
 codes_label:Codes
 
 [grangerenchanted.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extracharacters:Hermione Granger
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -819,6 +822,10 @@ extracharacters:Hermione Granger
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Hermione Granger
+
 ## Extra metadata that this adapter knows about.  See [dramione.org]
 ## for examples of how to use them.
 extra_valid_entries:read,reviews
@@ -855,18 +862,15 @@ extracharacters:Kirk,Spock
 extraships:Kirk/Spock
 
 [lumos.sycophanthex.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[merlinfic.dtwins.co.uk]
 ## Site dedicated to these categories/characters/ships
-extracategories:Merlin
+extracategories:Harry Potter
 
+[merlinfic.dtwins.co.uk]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -879,6 +883,9 @@ extracategories:Merlin
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Merlin
+
 [national-library.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:West Wing
@@ -890,24 +897,32 @@ extracategories:NCIS
 [netraptor.org]
 
 [nfacommunity.com]
-## Site dedicated to these categories/characters/ships
-extracategories:NCIS
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:NCIS
+
 [nha.magical-worlds.us]
 ## Site dedicated to these categories/characters/ships
 extracategories:Buffy: The Vampire Slayer
 extracharacters:Willow
 
 [occlumency.sycophanthex.com]
+## Some sites require login (or login for some rated stories) The
+## program can prompt you, or you can save it in config.  In
+## commandline version, this should go in your personal.ini, not
+## defaults.ini.
+#username:YourName
+#password:yourpassword
+
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 extracharacters:Severus Snape
 
+[onedirectionfanfiction.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -915,10 +930,15 @@ extracharacters:Severus Snape
 #username:YourName
 #password:yourpassword
 
-[onedirectionfanfiction.com]
+## Some sites also require the user to confirm they are adult for
+## adult content.  In commandline version, this should go in your
+## personal.ini, not defaults.ini.
+#is_adult:true
+
 ## Site dedicated to these categories/characters/ships
 extracategories:One Direction
 
+[pommedesang.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -931,40 +951,27 @@ extracategories:One Direction
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-[pommedesang.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:Anita Blake Vampire Hunter 
 
-## Some sites require login (or login for some rated stories) The
-## program can prompt you, or you can save it in config.  In
-## commandline version, this should go in your personal.ini, not
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## Some sites also require the user to confirm they are adult for
-## adult content.  In commandline version, this should go in your
-## personal.ini, not defaults.ini.
+[ponyfictionarchive.net]
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[ponyfictionarchive.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:My Little Pony: Friendship is Magic
 
+[pretendercentre.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[pretendercentre.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:The Pretender
 
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.  In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
 [samdean.archive.nu]
 ## Site dedicated to these categories/characters/ships
 extracategories:Supernatural
@@ -972,9 +979,6 @@ extracharacters:Sam,Dean
 extraships:Sam/Dean
 
 [scarhead.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -987,6 +991,9 @@ extracategories:Harry Potter
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [sg1-heliopolis.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
@@ -1017,9 +1024,6 @@ extracharacters:Draco Malfoy,Harry Potter
 extraships:Harry Potter/Draco Malfoy
 
 [thehookupzone.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Criminal Minds
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1032,6 +1036,9 @@ extracategories:Criminal Minds
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Criminal Minds
+
 [themasque.net]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -1046,9 +1053,6 @@ extracategories:Criminal Minds
 #is_adult:true
 
 [thequidditchpitch.org]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1061,19 +1065,19 @@ extracategories:Harry Potter
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-[tokra.fandomnet.com]
 ## Site dedicated to these categories/characters/ships
-extracategories:Stargate: SG-1
+extracategories:Harry Potter
 
+[tokra.fandomnet.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[trekiverse.org]
 ## Site dedicated to these categories/characters/ships
-extracategories:Star Trek
+extracategories:Stargate: SG-1
 
+[trekiverse.org]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1086,26 +1090,24 @@ extracategories:Star Trek
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Star Trek
+
 extra_valid_entries:awards
 awards_label:Awards
 
 cover_exclusion_regexp:art/.*Awards.jpg
 
 [www.adastrafanfic.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Star Trek
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-[www.dracoandginny.com]
 ## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extracharacters:Draco Malfoy,Ginny Weasley
-extraships:Draco Malfoy/Ginny Weasley
+extracategories:Star Trek
 
+[www.dracoandginny.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1118,14 +1120,16 @@ extraships:Draco Malfoy/Ginny Weasley
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Draco Malfoy,Ginny Weasley
+extraships:Draco Malfoy/Ginny Weasley
+
 [www.thealphagate.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:Stargate: SG-1
 
 [www.checkmated.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1133,6 +1137,9 @@ extracategories:Harry Potter
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [www.destinysgateway.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
@@ -1140,11 +1147,6 @@ extracategories:Harry Potter
 #is_adult:true
 
 [www.dokuga.com]
-## Site dedicated to these categories/characters/ships
-extracategories:InuYasha
-extracharacters:Sesshoumaru,Kagome
-extraships:Sesshoumaru/Kagome
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1152,6 +1154,11 @@ extraships:Sesshoumaru/Kagome
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:InuYasha
+extracharacters:Sesshoumaru,Kagome
+extraships:Sesshoumaru/Kagome
+
 [www.dotmoon.net]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -1207,14 +1214,14 @@ dateUpdated_format:%%Y-%%m-%%d %%H:%%M:%%S
 [www.ficbook.net]
 
 [www.fictionalley.org]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## fictionalley.org doesn't have a status metadatum.  If uncommented,
 ## this will be used for status.
 #default_value_status:Unknown
@@ -1237,6 +1244,23 @@ extra_valid_entries:reviews,favs,follows
 #password:yourpassword
 
 [www.fimfiction.net]
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
+## fimfiction.net stories can be locked requiring individual
+## passwords.  If fail_on_password is set, the downloader will fail
+## when a password is required rather than prompting every time.
+#fail_on_password: false
+
+## fimfiction.net stories allow chapters to be added out of order.  So
+## the newest chapter may not be the last one.  FFDL update 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.
+#do_update_hook:false
+
 ## Site dedicated to these categories/characters/ships
 extracategories:My Little Pony: Friendship is Magic
 
@@ -1267,55 +1291,33 @@ keep_in_order_groupsUrl:true
 ## make entryHTML.
 make_linkhtml_entries:prequel,sequels,groups
 
+[www.harrypotterfanfiction.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
-## fimfiction.net stories can be locked requiring individual
-## passwords.  If fail_on_password is set, the downloader will fail
-## when a password is required rather than prompting every time.
-#fail_on_password: false
-
-## fimfiction.net stories allow chapters to be added out of order.  So
-## the newest chapter may not be the last one.  FFDL update 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.
-#do_update_hook:false
-
-[www.harrypotterfanfiction.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.  In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
 [www.henneth-annun.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:The Hobbit
 
 [www.hpfandom.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 [www.hpfanficarchive.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
 
 [www.ik-eternal.net]
-## Site dedicated to these categories/characters/ships
-extracategories:InuYasha
-extracharacters:InuYasha,Kagome
-extraships:InuYasha/Kagome
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1328,30 +1330,35 @@ extraships:InuYasha/Kagome
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:InuYasha
+extracharacters:InuYasha,Kagome
+extraships:InuYasha/Kagome
+
 [www.jlaunlimited.com]
 ## Site dedicated to these categories/characters/ships
 extracategories:JLA
 
 [www.libraryofmoria.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Lord of the Rings
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Lord of the Rings
+
 [www.mediaminer.org]
 
 [www.midnightwhispers.ca]
-## Site dedicated to these categories/characters/ships
-extracategories:Queer as Folk
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Queer as Folk
+
 ## some sites include images that we don't ever want becoming the
 ## cover image.  This lets you exclude them.
 cover_exclusion_regexp:/stories/999/images/.*?_trophy.png
@@ -1366,10 +1373,6 @@ extracategories:CSI
 extraships:Nick Stokes/Greg Sanders
 
 [www.phoenixsong.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extraships:Harry Potter/Ginny Weasley
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1380,9 +1383,13 @@ extraships:Harry Potter/Ginny Weasley
 ## phoenixsong.net, oddly, can have high rated chapters (login
 ## required) in the middle of a lower rated story.  Use this to force
 ## FFDL to always login to phoenixsong.net so those stories download
-## correctly.
+## correctly.  If you have a login, this is recommended.
 #force_login:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extraships:Harry Potter/Ginny Weasley
+
 [www.potionsandsnitches.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
@@ -1405,17 +1412,15 @@ extracategories:Psych
 #is_adult:true
 
 [www.qaf-fic.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Queer as Folk
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Queer as Folk
+
 [www.restrictedsection.org]
-extracategories:Harry Potter
-extragenres:Erotica
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1423,20 +1428,21 @@ extragenres:Erotica
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extragenres:Erotica
+
 [www.scarvesandcoffee.net]
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
 ## Site dedicated to these categories/characters/ships
 extracategories:Glee
 extracharacters:Kurt Hummel,Blaine Anderson
 
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.  In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
 [www.simplyundeniable.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1444,15 +1450,18 @@ extracategories:Harry Potter
 #username:YourName
 #password:yourpassword
 
-[www.sinful-desire.org]
 ## Site dedicated to these categories/characters/ships
-extracategories:Supernatural
+extracategories:Harry Potter
 
+[www.sinful-desire.org]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Supernatural
+
 [www.siye.co.uk]
 ## Site dedicated to these categories/characters/ships
 extracategories:Harry Potter
@@ -1460,25 +1469,26 @@ extracharacters:Harry Potter,Ginny Weasley
 extraships:Harry Potter/Ginny Weasley
 
 [www.squidge.org/peja]
-# www.squidge.org/peja calls it Fandom <shrug>
+## www.squidge.org/peja calls it Fandom <shrug>
 category_label:Fandom
-# Remove numWords -- www.squidge.org/peja word counts are inaccurate
+
+## Remove numWords -- www.squidge.org/peja word counts are inaccurate
 titlepage_entries: seriesHTML,category,genre,language,characters,ships,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description
 
 [www.squidge.org/peja:txt]
-## Add URLs since there aren't links.
-# Remove numWords -- www.squidge.org/peja word counts are inaccurate
+## Add URLs since there aren't links and remove numWords --
+## www.squidge.org/peja word counts are inaccurate
 titlepage_entries: series,seriesUrl,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description
 
 [www.storiesofarda.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Lord of the Rings
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Lord of the Rings
+
 [www.thepetulantpoetess.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -1521,9 +1531,6 @@ collect_series: false
 extracategories:Twilight
 
 [www.twilighted.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Twilight
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1531,13 +1538,13 @@ extracategories:Twilight
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight
+
 ## twilighted.net (ab)uses series as personal reading lists.
 collect_series: false
 
 [www.twiwrite.net]
-## Site dedicated to these categories/characters/ships
-extracategories:Twilight
-
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -1545,20 +1552,23 @@ extracategories:Twilight
 #username:YourName
 #password:yourpassword
 
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight
+
 ## twiwrite.net (ab)uses series as personal reading lists.
 collect_series: false
 
 [www.walkingtheplank.org]
-## Site dedicated to these categories/characters/ships
-extracategories:Harry Potter
-extracharacters:Severus Snape,Harry Potter
-extraships:Severus Snape/Harry Potter
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape,Harry Potter
+extraships:Severus Snape/Harry Potter
+
 [www.whofic.com]
 
 [www.wizardtales.net]
@@ -1580,14 +1590,14 @@ extracategories:X-Men Movie
 extracharacters:Wolverine,Rogue
 
 [www.wraithbait.com]
-## Site dedicated to these categories/characters/ships
-extracategories:Stargate: Atlantis
-
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+## Site dedicated to these categories/characters/ships
+extracategories:Stargate: Atlantis
+
 [overrides]
 ## It may sometimes be useful to override all of the specific format,
 ## site and site:format sections in your private configuration.  For