diff --git a/defaults.ini b/defaults.ini
index ec3f8c41..1d47e81c 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -79,7 +79,7 @@ include_subject_tags: extratags, genre, category, lastupdate, status
 #include_tocpage: false
 
 # epub->mobi conversions typically don't like tables.
-titlepage_use_table: true
+titlepage_use_table: false
 
 ## When using tables, make these span both columns.
 wide_titlepage_entries: description, storyUrl, author URL
diff --git a/fanficdownloader/adapters/adapter_test1.py b/fanficdownloader/adapters/adapter_test1.py
index 3f4af12e..47f00dbc 100644
--- a/fanficdownloader/adapters/adapter_test1.py
+++ b/fanficdownloader/adapters/adapter_test1.py
@@ -46,7 +46,10 @@ Some more longer description.  "I suck at summaries!"  "Better than it sounds!"
 ''')
         self.story.setMetadata('datePublished',datetime.date(1972, 01, 31))
         self.story.setMetadata('dateCreated',datetime.datetime.now())
-        self.story.setMetadata('dateUpdated',datetime.date(1975, 01, 31))
+        if self.story.getMetadata('storyId') == '669':
+            self.story.setMetadata('dateUpdated',datetime.datetime.now())
+        else:
+            self.story.setMetadata('dateUpdated',datetime.date(1975, 01, 31))
         self.story.setMetadata('numChapters','5')
         self.story.setMetadata('numWords','123456')
         self.story.setMetadata('status','In-Completed')
@@ -75,15 +78,23 @@ Some more longer description.  "I suck at summaries!"  "Better than it sounds!"
                             
 
     def getChapterText(self, url):
-#        return "<p>Really short chapter</p>"
-#         return u'''
-# <div id=storytext class=storytext><p>&#8220;It might be all it takes.&#8221; He held out his hand and shook Wilfred&#8217;s, he glanced at the Vinvocci woman as she knelt there cradling the body of her partner, and he said not a word.<br /></p><p><b>Disclaimer: I don't own Harry Potter or the craziness of Romilda Vane.</b></p><p><b>*EDIT* Romilda is in her 4th year, like she always has.</b></p><p><b>Thanks xxSkitten for Beta reading this! :D<br></b></p><p><b>Full Summary: Harry and Ginny are together. Romilda Vane is not happy. She can't stand seeing the guy she </b><i><b>wants</b></i><b> to be with the person she </b><i><b>deserves</b></i><b> to be with, with another girl - especially a girl younger that is far less pretty than her. She orders 100 Love potions from Weasley's Wizard Wheezes, Wonder Witch line. Several get to undesired targets, such as Ron Weasley. What happens when Ginny takes matters into her own hands?</b></p><p><b><hr size=1 noshade></b></p><p><b><u>Romilda Vane (3rd Person)</u></b></p><p>"Th-Tha-That little skank!" snarled Romilda Vane as she watched Harry Potter and Ginny Weasley from the balcony overlooking the common room.</p><p>"Romilda," said Abigail Stones, one of her friends, "Lets go, you don't need to watch this."</p><p>Abigail stones had long, sleek black hair that was always in a high ponytail. She had pale skin that very few blemishes. She had a long, blocky nose and a small mouth. Her hazel eyes were behind think horned rimmed glasses, and her uniform was in order without a crease or wrinkle in sight.</p><p>"What does he <i>see</i> in her?" Romilda snarled in a whisper, her eyes upon the red-headed fifth year. "I mean, she's all freckle-y and gingery, she's a filthy fifth year-"</p><p>"And you're a fourth year!" Abigail interjected, but Romilda just kept on ranting.</p><p>"…and I heard they live in a dump!" Her nostrils flared.</p><p>"Well what are you going to do about it, just sit and watch them all the time?" Piped up Charlotte Henderson, the second of Romilda's present friends. She had curly shoulder length blonde hair and wore a thick layer of make up to cover up her various large red pimples. Her eyes were dark blue and were surrounded with large clumpy eyelashes. She had an eager expression, like she was witnessing two people on a Muggle drama who were about to kiss.</p><p>"Of course not!" She said, looking away as Ginny kissed Harry. "I've ordered one-hundred love potions from that Wonder Witch line from Weasley's Wizard Wheezes, so once I get him in my grasp I'll have him for the rest of the year!"</p><p>"You realize," Abigail said, rolling her eyes slightly. "That with your luck, you'll get every guy in the school but him."</p><p>"It will only be for around an hour, and I could always just make him jealous by making every guy close to him fall in love with me."</p><p>Abigail sighed, "One, he has a girlfriend. Two, you already got his best friend and he <i>wasn't</i> jealous, he was pissed, and three, you'll get expelled before you can get to him."</p><p>"Sometimes I wonder how we're friends!" Romilda snapped at Abigail.</p><p>"We're friends because you need a good influence around you, or you would be as crazy as Peeves." Abigail stated.</p><p>Romilda spun around to glare at her friend, knowing Abigail was right but did not daring to admit it.</p><p>The silence was broken by Charlotte. "So how are you going to slip him the potion?" She asked, honestly interested.</p><p>"Just wait 'till morning, and you'll see." Romilda said, looking back down at Harry, then suddenly realizing Ginny wasn't there.</p><p>Then, Ginny appeared next to them. She stalked through their group, not looking at any of them. She stopped at the girl's dorm door and turned her head slightly to see them from the corner of her eye.</p><p>"One-hundred? You're <i>that</i> desperate?" Ginny said with a mix of humor and anger. Then, the red-head turned to the door and left them all in a surprised state.</p><p>"You're screwed." Abigail said matter-of-factly. She went into the dorm without another word.</p><p>"She can be so insensitive." Charlotte said, looking where Abigail had left while shaking her head.</p><p>"You can say that again," mumbled Romilda, downcast.</p><p>"She can be-" Charlotte began again, but Romilda held her hand up.</p><p>"That was a figure of speech, pea-brain." She snapped. "Sometimes you can be as dumb as that Loony Lovegood." She then stalked up to her room with one last pleading look at Harry, whispering fiercely under her breath.</p><p>"You will be mine…"</p><hr size=1 noshade><p><b>Isn't Romilda Pleasant? ;] xD Oh she's crazy, insane, envious, has stalkerish and man stealing tendencies. and that's why she's everyone's FAVORITE character.</b></p><p><b>Also Romilda's in her fourth year. yeah. oh an NO FEMSLASH geez.<br></b></p><p><b>Also, Abigail Stones and Charlotte Henderson are to OC's that i made up on the spot because even crazies need friends. Ones the ignored good influence and ones a stereotypical dumb 'blonde' (NO OFFENSE TO BLONDES! I'm blonde and I don't take those things that personally unless their clearly mean that way. Also Charlotte's Muggle-Born so she watches all those Muggle TV's shows were all addicted too. ;] .. )</b></p><p><b>The rest of the story will be in Ginny's point of view whether its 1st or 3rd Person IDK yet but probably 1st person. The pairing in this are - Harry x Ginny / Romilda x Harry / Ron x Hermione (hints of) / Charolette x OC (Undetermined).</b></p><p><b>Reviews = Something... GOOD!</b></p><p><i><b>~ Sincerely MNM</b></i></p>
-
-# </div>'''
         if self.story.getMetadata('storyId') == '667':
             raise exceptions.FailedToDownload("Error downloading Chapter: %s!" % url)
 
-        soup = bs.BeautifulStoneSoup(u'''
+        if "chapter=1" in url :
+            text=u'''
+<div>
+<h3>Prologue</h3>
+<p>This is a fake adapter for testing purposes.  Different storyId's will give different errors:</p>
+<p>http://test1.com?sid=666 - raises StoryDoesNotExist</p>
+<p>http://test1.com?sid=667 - raises FailedToDownload on chapter 1</p>
+<p>http://test1.com?sid=668 - raises FailedToLogin unless username='Me'</p>
+<p>http://test1.com?sid=669 - Succeeds with Updated Date=now</p>
+<p>And other storyId will succeed with the same output.</p>
+</div>
+'''
+        else:
+            text=u'''
 <div>
 <h3>Chapter</h3>
 <p><center>Centered text</center></p>
@@ -96,7 +107,8 @@ horizontal rules
 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 </div>
-''',selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
+'''
+        soup = bs.BeautifulStoneSoup(text,selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
         return utf8FromSoup(soup)
 
 def getClass():
diff --git a/fanficdownloader/adapters/base_adapter.py b/fanficdownloader/adapters/base_adapter.py
index 67c0033a..f4c012c2 100644
--- a/fanficdownloader/adapters/base_adapter.py
+++ b/fanficdownloader/adapters/base_adapter.py
@@ -27,6 +27,8 @@ class BaseSiteAdapter(Configurable):
     def __init__(self, config, url):
         Configurable.__init__(self, config)
         self.addConfigSection(self.getSiteDomain())
+        self.addConfigSection("commandline")
+        
         self.opener = u2.build_opener(u2.HTTPCookieProcessor())
         self.storyDone = False
         self.metadataDone = False
diff --git a/fanficdownloader/writers/base_writer.py b/fanficdownloader/writers/base_writer.py
index 7e8d13c3..47024e4e 100644
--- a/fanficdownloader/writers/base_writer.py
+++ b/fanficdownloader/writers/base_writer.py
@@ -24,6 +24,8 @@ class BaseStoryWriter(Configurable):
     def __init__(self, config, story):
         Configurable.__init__(self, config)
         self.addConfigSection(self.getFormatName())
+        ## Pass adapter instead, to check date before fetching all?
+        ## Or add 'check update' method to writer?
         self.story = story
         self.titleLabels = {
             'category':'Category',
@@ -127,6 +129,8 @@ class BaseStoryWriter(Configurable):
     def writeStory(self,outstream=None):
         self.addConfigSection(self.story.getMetadata('site'))
         self.addConfigSection(self.story.getMetadata('site')+":"+self.getFormatName())
+        self.addConfigSection("commandline")
+        
         for tag in self.getConfigList("extratags"):
             self.story.addToList("extratags",tag)
 
@@ -148,6 +152,8 @@ class BaseStoryWriter(Configurable):
                     path+=dir+"/"
                     if not os.path.exists(path):
                         os.mkdir(path) ## os.makedirs() doesn't work in 2.5.2?
+
+            ## Check for output file date vs updated date here?
             outstream = open(outfilename,"wb")
         else:
             close=False
diff --git a/fanficdownloader/writers/writer_epub.py b/fanficdownloader/writers/writer_epub.py
index 52f18dcb..e06c4140 100644
--- a/fanficdownloader/writers/writer_epub.py
+++ b/fanficdownloader/writers/writer_epub.py
@@ -57,7 +57,7 @@ h6 { text-align: center; }
 <link href="stylesheet.css" type="text/css" charset="UTF-8" rel="stylesheet"/>
 </head>
 <body>
-<h1><a href="${storyUrl}">${title}</a> by <a href="${authorUrl}">${author}</a></h1>
+<h3><a href="${storyUrl}">${title}</a> by <a href="${authorUrl}">${author}</a></h3>
 <div>
 ''')
 
diff --git a/main.py b/main.py
index 08838957..9bf69855 100644
--- a/main.py
+++ b/main.py
@@ -108,7 +108,7 @@ class EditConfigServer(webapp.RequestHandler):
             if uconfig is None:
                 uconfig = UserConfig()
             uconfig.user = user
-            uconfig.config = self.request.get('config').encode('utf8')[:1000000] ## just in case.
+            uconfig.config = self.request.get('config').encode('utf8')[:10000] ## just in case.
             uconfig.put()
             self.redirect("/?error=configsaved")
         else: # not update, assume display for edit
@@ -222,8 +222,25 @@ class RecentFilesServer(webapp.RequestHandler):
         template_values = dict(fics = fics, nickname = user.nickname())
         path = os.path.join(os.path.dirname(__file__), 'recent.html')
         self.response.out.write(template.render(path, template_values))
+
+class UserConfigServer(webapp.RequestHandler):
+    def getUserConfig(self,user):
+        config = ConfigParser.SafeConfigParser()
+
+        ## Pull user's config record.
+        l = UserConfig.all().filter('user =', user).fetch(1)
+        ## TEST THIS
+        if l and l[0].config:
+            uconfig=l[0]
+            logging.debug('reading config from UserConfig(%s)'%uconfig.config)
+            config.readfp(StringIO.StringIO(uconfig.config))                
+        else:
+            logging.debug('reading defaults.ini config file')
+            config.read('defaults.ini')
+
+        return config
         
-class FanfictionDownloader(webapp.RequestHandler):
+class FanfictionDownloader(UserConfigServer):
     def get(self):
         self.post()
 
@@ -258,18 +275,7 @@ class FanfictionDownloader(webapp.RequestHandler):
 
         adapter = None
         try:
-            config = ConfigParser.SafeConfigParser()
-
-            ## Pull user's config record.
-            l = UserConfig.all().filter('user =', user).fetch(1)
-            if l:
-                uconfig=l[0]
-                logging.debug('reading config from UserConfig')
-                config.readfp(StringIO.StringIO(uconfig.config))                
-            else:
-                logging.debug('reading defaults.ini config file')
-                config.read('defaults.ini')
-            
+            config = self.getUserConfig(user)
             adapter = adapters.getAdapter(config,url)
             logging.info('Created an adaper: %s' % adapter)
         
@@ -321,7 +327,7 @@ class FanfictionDownloader(webapp.RequestHandler):
         return
 
 
-class FanfictionDownloaderTask(webapp.RequestHandler):
+class FanfictionDownloaderTask(UserConfigServer):
     def _printableVersion(self, text):
         text = removeEntities(text)
         try:
@@ -362,19 +368,7 @@ class FanfictionDownloaderTask(webapp.RequestHandler):
         logging.info('Creating adapter...')
         
         try:
-            config = ConfigParser.ConfigParser()
-            config = ConfigParser.SafeConfigParser()
-
-            ## Pull user's config record.
-            l = UserConfig.all().filter('user =', user).fetch(1)
-            if l:
-                uconfig=l[0]
-                logging.debug('reading config from UserConfig')
-                config.readfp(StringIO.StringIO(uconfig.config))                
-            else:
-                logging.debug('reading defaults.ini config file')
-                config.read('defaults.ini')
-            
+            config = self.getUserConfig(user)
             adapter = adapters.getAdapter(config,url)
         except Exception, e:
             logging.exception(e)
diff --git a/newdownload.py b/newdownload.py
index 550ad5fd..e9aeecae 100644
--- a/newdownload.py
+++ b/newdownload.py
@@ -4,45 +4,74 @@ import logging
 logging.basicConfig(level=logging.DEBUG,format="%(levelname)s:%(filename)s(%(lineno)d):%(message)s")
 
 import sys, os
+from optparse import OptionParser      
 import getpass
 
 from fanficdownloader import adapters,writers,exceptions
 
 import ConfigParser
 
-config = ConfigParser.SafeConfigParser()
-
-logging.debug('reading defaults.ini config file, if present')
-config.read('defaults.ini')
-logging.debug('reading personal.ini config file, if present')
-config.read('personal.ini')
-
-def writeStory(adapter,writeformat):
+def writeStory(config,adapter,writeformat):
     writer = writers.getWriter(writeformat,config,adapter.getStory())
     writer.writeStory()
     del writer
 
-try:
-    adapter = adapters.getAdapter(config,sys.argv[1])
-        
-    try:
-        print adapter.getStory()
-    except exceptions.FailedToLogin, ftl:
-        print "Login Failed, Need Username/Password."
-        sys.stdout.write("Username: ")
-        adapter.username = sys.stdin.readline().strip()
-        adapter.password = getpass.getpass(prompt='Password: ')
-        #print("Login: `%s`, Password: `%s`" % (adapter.username, adapter.password))
-        print adapter.getStory()
+def main():
+       
+   # read in args, anything starting with -- will be treated as --<varible>=<value>
+   usage = "usage: %prog [options] storyurl"
+   parser = OptionParser(usage)
+   parser.add_option("-f", "--format", dest="format", default='epub',
+                     help="write story as FORMAT, epub(default), text or html", metavar="FORMAT")
+   parser.add_option("-o", "--option",
+                     action="append", dest="options",
+                     help="set an option NAME=VALUE", metavar="NAME=VALUE")
+   
+   (options, args) = parser.parse_args()
 
-    writeStory(adapter,"epub")
-    writeStory(adapter,"html")
-    writeStory(adapter,"txt")
-    del adapter
+   if len(args) != 1:
+       parser.error("incorrect number of arguments")
 
-except exceptions.InvalidStoryURL, isu:
-    print isu
-except exceptions.StoryDoesNotExist, dne:
-    print dne
-except exceptions.UnknownSite, us:
-    print us
+   config = ConfigParser.SafeConfigParser()
+   
+   logging.debug('reading defaults.ini config file, if present')
+   config.read('defaults.ini')
+   logging.debug('reading personal.ini config file, if present')
+   config.read('personal.ini')
+   
+   config.add_section("commandline")
+   if options.options:
+       for opt in options.options:
+           (var,val) = opt.split('=')
+           config.set("commandline",var,val)
+
+   try:
+       adapter = adapters.getAdapter(config,args[0])
+           
+       try:
+           print adapter.getStoryMetadataOnly()
+       except exceptions.FailedToLogin, ftl:
+           print "Login Failed, Need Username/Password."
+           sys.stdout.write("Username: ")
+           adapter.username = sys.stdin.readline().strip()
+           adapter.password = getpass.getpass(prompt='Password: ')
+           #print("Login: `%s`, Password: `%s`" % (adapter.username, adapter.password))
+           print adapter.getStoryMetadataOnly()
+
+
+       ## XXX Use format.
+       print "format: %s" % options.format
+       writeStory(config,adapter,"epub")
+       writeStory(config,adapter,"html")
+       writeStory(config,adapter,"txt")
+       del adapter
+   
+   except exceptions.InvalidStoryURL, isu:
+       print isu
+   except exceptions.StoryDoesNotExist, dne:
+       print dne
+   except exceptions.UnknownSite, us:
+       print us
+   
+if __name__ == "__main__":
+    main()