diff --git a/Doxyfile b/Doxyfile
index 3fed194f..6d86e5c6 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = HTML Purifier
-PROJECT_NUMBER         = 1.3.2
+PROJECT_NUMBER         = 1.4.0
 OUTPUT_DIRECTORY       = "C:/Documents and Settings/Edward/My Documents/My Webs/htmlpurifier/docs/doxygen"
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
diff --git a/NEWS b/NEWS
index 2bd97555..1eb74717 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
-1.4.0, unknown release date
+1.4.0, released 2007-01-21
 ! Implemented list-style-image, URIs now allowed in list-style
 ! Implemented background-image, background-repeat, background-attachment
   and background-position CSS properties. Shorthand property background
@@ -22,15 +22,13 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
 ! YouTube preservation code added to the core, with two lines of code
   you can add it as a filter to your code. See smoketests/preserveYouTube.php
   for sample code.
+! Moved SLOW to docs/enduser-slow.html and added code examples
 - Replaced version check with functionality check for DOM (thanks Stephen
   Khoo)
 . Added smoketest 'all.php', which loads all other smoketests via frames
 . Implemented AttrDef_CSSURI for url(http://google.com) style declarations
 . Added convenient single test selector form on test runner
 
-1.3.3, unknown release date, likely to be dropped
-! Moved SLOW to docs/enduser-slow.html and added code examples
-
 1.3.2, released 2006-12-25
 ! HTMLPurifier object now accepts configuration arrays, no need to manually
   instantiate a configuration object
diff --git a/TODO b/TODO
index aa625d3a..df7b9184 100644
--- a/TODO
+++ b/TODO
@@ -8,7 +8,7 @@ TODO List
 ==========================
 
 1.5 release
- # Implement all non-essential attribute transforms
+ # Implement all non-essential attribute transforms, configurable
  # URI validation routines tighter (see docs/dev-code-quality.html) (COMPLEX)
  # Advanced URI filtering schemes (see docs/proposal-new-directives.txt)
  # Error logging for filtering/cleanup procedures
@@ -62,6 +62,11 @@ TODO List
  - Allow tags to be "armored", an internal flag that protects them
    from validation and passes them out unharmed
  - XHTML 1.1 support
+ - Fixes for Firefox's inability to handle COL alignment props (Bug 915)
+ - Automatically add non-breaking spaces to empty table cells when
+   empty-cells:show is applied to have compatibility with Internet Explorer
+ - Convert RTL/LTR override characters to <bdo> tags, or vice versa on demand.
+   Also, enable disabling of directionality
 
 Ongoing
  - Lots of profiling, make it faster!
@@ -72,11 +77,6 @@ Ongoing
 
 Unknown release (on a scratch-an-itch basis)
  - Upgrade SimpleTest testing code to newest versions
- - Fixes for Firefox's inability to handle COL alignment props (Bug 915)
- - Automatically add non-breaking spaces to empty table cells when
-   empty-cells:show is applied to have compatibility with Internet Explorer
- - Convert RTL/LTR override characters to <bdo> tags, or vice versa on demand.
-   Also, enable disabling of directionality
  - Have 'lang' attribute be checked against official lists
  ? Semi-lossy dumb alternate character encoding transformations, achieved by
    encoding all characters that have string entity equivalents
@@ -84,7 +84,6 @@ Unknown release (on a scratch-an-itch basis)
 Requested
  ? Native content compression, whitespace stripping (don't rely on Tidy, make
    sure we don't remove from <pre> or related tags)
- ? Win32 Phalanger C# binaries
 
 Wontfix
  - Non-lossy smart alternate character encoding transformations (unless
diff --git a/art/1000passes.png b/art/1000passes.png
new file mode 100644
index 00000000..3351c92a
Binary files /dev/null and b/art/1000passes.png differ
diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php
index 0e1b54ea..2d748673 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -22,7 +22,7 @@
  */
 
 /*
-    HTML Purifier 1.3.2 - Standards Compliant HTML Filtering
+    HTML Purifier 1.4.0 - Standards Compliant HTML Filtering
     Copyright (C) 2006 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -64,7 +64,7 @@ require_once 'HTMLPurifier/Encoder.php';
 class HTMLPurifier
 {
     
-    var $version = '1.3.2';
+    var $version = '1.4.0';
     
     var $config;
     var $filters;
diff --git a/library/HTMLPurifier/AttrDef/BackgroundPosition.php b/library/HTMLPurifier/AttrDef/BackgroundPosition.php
index 0c620b39..0b59c403 100644
--- a/library/HTMLPurifier/AttrDef/BackgroundPosition.php
+++ b/library/HTMLPurifier/AttrDef/BackgroundPosition.php
@@ -88,14 +88,14 @@ class HTMLPurifier_AttrDef_BackgroundPosition extends HTMLPurifier_AttrDef
             }
             
             // test for length
-            $r = $this->length->validate($bit, $config, &$context);
+            $r = $this->length->validate($bit, $config, $context);
             if ($r !== false) {
                 $measures[] = $r;
                 $i++;
             }
             
             // test for percentage
-            $r = $this->percentage->validate($bit, $config, &$context);
+            $r = $this->percentage->validate($bit, $config, $context);
             if ($r !== false) {
                 $measures[] = $r;
                 $i++;