diff --git a/README.md b/README.md
index 395a86843686fdc90ff9c0ec2d4db715b5f42ac1..91a7218c3165ce6821cbe2827cebb041d7050dc7 100644
--- a/README.md
+++ b/README.md
@@ -14,3 +14,7 @@ Features over mgottschlag's version:
 
 - Some bugfixes
 
+- Two layouts
+
+- Useractionsmenu for toggling tiling/floating
+
diff --git a/commentary.org b/commentary.org
index 92e6144a1f4da718f31ee6840bd9f8a2618af58d..c89554bc7293a9ae071064a7a873fa0229f3b819 100644
--- a/commentary.org
+++ b/commentary.org
@@ -1,7 +1,10 @@
 * TODO Make rules for tiling
 ** HACK Ignore yakuake and menus/dialogs for tiling
-* TODO Resize tiles
-* TODO Floating
+   Waiting for KDE 4.11 which allows configuration for kwin scripts
+** DONE Add useractionsmenu
+* DONE Resize tiles
+  Hacked for Spirallayout, working for Halflayout
+* DONE Floating
 ** DONE Toggle floating
    Somehow client.tiling_floating stays the same across acesses (fixed?)
 ** DONE Floating layout/disable script
@@ -11,9 +14,10 @@
    Make configurable?
 * TODO EDGECASES, EDGECASES, EDGECASES!
 ** TODO Doesn't tile properly when screen disappears
-** TODO Don't tile fullscreen windows on workspace change
+** DONE Don't tile fullscreen windows on workspace change
 ** TODO Windows can sometimes resize on their own (missing signal?)
 ** TODO Focus-follows-mouse doesn't properly refocus on window kill (kwin bug or timing mishap?)
+** TODO Tileindex not properly set on workspace switch
 * DONE Killing three clients in succession without opening another in between kills the script
 ** This was the result of removing an element from an array and afterwards accessing it by index
 * DONE Retile on minimize
@@ -23,6 +27,7 @@
 ** Weird configurations
 ** Multi-monitor (semi-tested right now)
 
+** Multiple workspaces (e.g. moving windows across, in floating and tiling mode)
 * TODO Learning
 ** How to add configuration
 ** How to use the tests