diff --git a/STYLE b/STYLE
index be23cb8..e55d75d 100644
--- a/STYLE
+++ b/STYLE
@@ -7,13 +7,13 @@
 
 * Follow the coding style of the other modules.
 
-* Code should be compilable with -Wall -Werror -fno-warn-unused-do-bind.
+* Code should be compilable with -Wall -Werror -fno-warn-unused-do-bind -fwarn-tabs.
   There should be no warnings.
 
 * Partial functions should be avoided: the window manager should not
   crash, so do not call `error` or `undefined`
 
-* Tabs are illegal. Use 4 spaces for indenting.
+* Use 4 spaces for indenting.
 
 * Any pure function added to the core should have QuickCheck properties
   precisely defining its behavior.
diff --git a/TODO b/TODO
index 5664f58..1b3f644 100644
--- a/TODO
+++ b/TODO
@@ -1,23 +1,14 @@
- - Write down invariants for the window life cycle, especially:
-    - When are borders set?  Prove that the current handling is sufficient.
-
- - current floating layer handling is nonoptimal. FocusUp should raise,
-   for example
-
- - Issues still with stacking order.
-
 = Release management =
 
-* configuration documentation
-
-* generate haddocks for core and XMC, upload to xmonad.org
+* generate, and push website haddocks with xmonad-web/gen-docs.sh
 * generate manpage, generate html manpage
 * double check README build instructions
-* test core with 6.6 and 6.8
 * bump xmonad.cabal version and X11 version
+* update cabal "tested-with:" fields
 * upload X11 and xmonad to Hackage
-* update links to hackage in download.html
 * update #xmonad topic
 * check examples/text in user-facing Config.hs
 * check tour.html and intro.html are up to date, and mention all core bindings
 * confirm template config is type correct
+* update haskellwiki notable changes since x.x
+* email announce