diff --git a/recipes/ap.recipe b/recipes/ap.recipe
index 2b9f9e5571..23bac31e43 100644
--- a/recipes/ap.recipe
+++ b/recipes/ap.recipe
@@ -11,7 +11,6 @@ class AssociatedPress(BasicNewsRecipe):
     language = 'en'
     no_stylesheets = True
     max_articles_per_feed = 15
-    html2lrf_options = ['--force-page-break-before-tag="chapter"']
 
 
     preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
diff --git a/setup/upload.py b/setup/upload.py
index d9d073388a..d07a26b4d7 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -77,7 +77,7 @@ def get_google_data():
         'path_map_location':'/var/www/status.calibre-ebook.com/googlepaths',
         # If you change this remember to change it in the
         # status.calibre-ebook.com server as well
-        'project':'calibre-ebook-ii'
+        'project':'calibre-ebook'
     }
 
 def get_sourceforge_data():
diff --git a/src/calibre/ebooks/oeb/display/cfi.coffee b/src/calibre/ebooks/oeb/display/cfi.coffee
index be0db66a31..4b5b490c82 100644
--- a/src/calibre/ebooks/oeb/display/cfi.coffee
+++ b/src/calibre/ebooks/oeb/display/cfi.coffee
@@ -5,13 +5,18 @@
  Copyright 2011, Kovid Goyal <kovid@kovidgoyal.net>
  Released under the GPLv3 License
  Based on code originally written by Peter Sorotkin
- (http://code.google.com/p/epub-revision/source/browse/trunk/src/samples/cfi/epubcfi.js)
+ http://code.google.com/p/epub-revision/source/browse/trunk/src/samples/cfi/epubcfi.js
+
  Improvements with respect to that code:
  1. Works on all browsers (WebKit, Firefox and IE >= 8)
- 2. Works for elements that are scrollable (i.e. have their own scrollbars)
+ 2. Works for content in elements that are scrollable (i.e. have their own scrollbars)
+ 3. Much more comprehensive testing/error handling
+ 4. Properly encodes/decodes assertions
 
  To check if this script is compatible with the current browser, call
  window.cfi.is_compatible() it will throw an exception if not compatible.
+
+ Tested on: Firefox 9, IE 9, Chromium 16, Qt WebKit 2.1
 ###
 
 log = (error) -> # {{{