diff --git a/README.md b/README.md
index 799e37aacefa9000ef1216d34c3c423feff81f9e..395a86843686fdc90ff9c0ec2d4db715b5f42ac1 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,14 @@ kwin-tiling
 
 Tiling script for kwin, based on Mathias Gottschlag's version (https://github.com/mgottschlag/kwin-tiling).
 
+Features over mgottschlag's version:
+-------
+
+- Support for minimizing and unminimizing windows
+
+- Support for setting windows to floating or quitting tiling altogether
+
+- Support for a list of ignored windows (in code for now) 
+
+- Some bugfixes
 
diff --git a/commentary.org b/commentary.org
index 376ee8f84357747bcd1b496cdda24fda4063be7b..92e6144a1f4da718f31ee6840bd9f8a2618af58d 100644
--- a/commentary.org
+++ b/commentary.org
@@ -3,15 +3,32 @@
 * TODO Resize tiles
 * TODO Floating
 ** DONE Toggle floating
-   Somehow client.tiling_floating stays the same across acesses
+   Somehow client.tiling_floating stays the same across acesses (fixed?)
 ** DONE Floating layout/disable script
+   *** Currently moves and resizes windows on disable
 ** DONE Make floating windows be _above_ tilers
    Somehow accessing client.keepAbove doesn't work
    Make configurable?
 * TODO EDGECASES, EDGECASES, EDGECASES!
 ** TODO Doesn't tile properly when screen disappears
 ** TODO 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?)
 * 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
 
+* TODO Testing
+** Weird apps (mplayer, gimp)
+** Weird configurations
+** Multi-monitor (semi-tested right now)
+
+* TODO Learning
+** How to add configuration
+** How to use the tests
+** Javascript
+
+* TODO Optimization
+* TODO Crazy stuff
+  ** Overlap titlebars and abuse keepAbove to save space?
+  Can we even get the size of a window _without_ titlebar?