diff --git a/Docs/TODO-CSS b/Docs/TODO-CSS
index 149e9464a..7d8eb57dc 100644
--- a/Docs/TODO-CSS
+++ b/Docs/TODO-CSS
@@ -9,34 +9,34 @@ A "=" before the property means that it is partially implemented.
 
 See TODO-HTML for HTML related TODOs.
 
-+ background (attachment in progress)
-= background-attachment
-+ background-color
-+ background-image
-+ background-position
-+ background-repeat
-= border
-= border-collapse
-= border-color
-= border-spacing
-= border-style
-= border-[top|right|left|bottom]
-= border-*-color
-= border-*-style
-= border-*-width
-- bottom
++ background (attachment in progress)	(some problems with inlines)
+= background-attachment			(some problems with inlines)
++ background-color			(some problems with inlines)
++ background-image			(some problems with inlines)
++ background-position			(some problems with inlines)
++ background-repeat			(some problems with inlines)
+= border				(some problems with inlines)
+= border-collapse			(some problems with inlines)
+= border-color				(some problems with inlines)
+= border-spacing			(some problems with inlines)
+= border-style				(some problems with inlines)
+= border-[top|right|left|bottom]	(some problems with inlines)
+= border-*-color			(some problems with inlines)
+= border-*-style			(some problems with inlines)
+= border-*-width			(some problems with inlines)
++ bottom
 - caption-side
-+ clear
+= clear					(some problems with this)
 - clip
 + color
 - content
-- counter-increment
-- counter-reset
++ counter-increment			(done but can't be used until content is done)
++ counter-reset				(done but can't be used until content is done)
 + cursor
 - direction
 + display
 - empty-cells
-+ float
+= float					(some problems with this)
 = font (style, weight, size, line-spacing, family, variant)
 + font-family
 + font-size
@@ -45,16 +45,16 @@ See TODO-HTML for HTML related TODOs.
 + font-style
 + font-variant
 + font-weight
-+ height
-- left
++ height				(percentage heights are not implemented)
++ left
 - letter-spacing
 + line-height
 - list-style
 - list-style-image
 - list-style-position
 - list-style-type
-= margin
-= margin-[top|right|left|bottom]
+= margin				(some problems with inlines)
+= margin-[top|right|left|bottom]	(some problems with inlines)
 - marker-offset
 - marks
 - max-height
@@ -67,25 +67,25 @@ See TODO-HTML for HTML related TODOs.
 - outline-style
 - outline-width
 = overflow
-= padding
-= padding-[top|right|left|bottom]
+= padding				(some problems with inlines)
+= padding-[top|right|left|bottom]	(some problems with inlines)
 - page
 - page-break-[after|before|inside]
-- position
+= position				(fixed not done. static position not implemented)
 - quotes
-- right
++ right
 - size
 - table-layout
 + text-align
-+ text-decoration (not blink)
++ text-decoration (not blink)		(text decoration is currently applied to images too)
 + text-indent
 - text-shadow
 + text-transform
-- top
++ top
 - unicode-bidi
 = vertical-align
 = visibility (not collapse)
-= white-space
+= white-space				(nowrap not done)
 - widows
 + width
 - word-spacing
diff --git a/Docs/TODO-HTML b/Docs/TODO-HTML
index 16dd2fc8c..03fb5f973 100644
--- a/Docs/TODO-HTML
+++ b/Docs/TODO-HTML
@@ -15,20 +15,16 @@ Text Formatting:
 Lists:
 	<LI>
 	<OL>,<UL>
-	
-Tables: 
-	Borders, 
 
 Objects:
 	Alt text
 
 Forms:
-       "disabled" attribute
-       A few textarea rendering issues
+	"disabled" attribute
+	A few textarea rendering issues
 
 Frames:
-	Actually support them. NetSurf passes the test suite's 
-	single test for non-frames-supporting browsers.
+	Currently messy. Change to use nested windows.
 	
 General:
 	height="some%" - 13.7.1
\ No newline at end of file