diff --git a/TODO b/TODO
index be9feb46..f19688f8 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,7 @@ TODO List
  - Distinguish between different types of URIs, for instance, a mailto URI
    in IMG SRC is nonsensical
  - Error logging for filtering/cleanup procedures
+ - Rich set* methods and config file loaders for HTMLPurifier_Config
 
 1.3 release
  - Add various "levels" of cleaning
@@ -50,6 +51,7 @@ Unknown release (on a scratch-an-itch basis)
    Also, enable disabling of directionality
  - Append something to duplicate IDs so they're still usable (impl. note: the
    dupe detector would also need to detect the suffix as well)
+ - Have 'lang' attribute be checked against official lists
 
 Encoding workarounds
  - Non-lossy dumb alternate character encoding transformations, achieved by
diff --git a/docs/code-quality.txt b/docs/code-quality.txt
index 8fd8e4d3..28041993 100644
--- a/docs/code-quality.txt
+++ b/docs/code-quality.txt
@@ -10,14 +10,11 @@ optimization issues, that needs to be done after intense profiling.
 AttrDef
     Class - doesn't support Unicode characters (fringe); uses regular
         expressions
-    Lang - code duplication; premature optimization; doesn't consult official
-        lists (fringe)
+    Lang - code duplication; premature optimization
     Length - easily mistaken for CSSLength
-    URI - multiple regular expressions; missing validation for query,
-        fragment and path
+    URI - multiple regular expressions; missing validation for parts (?)
     CSS - parser doesn't accept advanced CSS (fringe)
     Number - constructor interface inconsistent with Integer
-Config - "load configuration" hooks missing, rich set* accessors missing
 ConfigSchema - redefinition is a mess
 Strategy
     FixNesting - cannot bubble nodes out of structures