diff --git a/README.txt b/README.txt
index d1cb6bb..73f16cb 100644
--- a/README.txt
+++ b/README.txt
@@ -20,23 +20,24 @@ $Id$
 
 A software and GPU emulated HD output device plugin for VDR.
 
-    o Video VA-API/VA-API (with intel, nvidia and amd backend supported)
-    o Video CPU/VA-API
-    o Video VDPAU/VDPAU
-    o Video CPU/VDPAU
-    o Audio FFMpeg/Alsa/Analog
-    o Audio FFMpeg/Alsa/Digital
-    o Audio FFMpeg/OSS/Analog
-    o HDMI/SPDIF Passthrough
-    o VA-API bob software deinterlace
-    o Auto-crop
+    o Video decoder CPU / VA-API / VDPAU
+    o Video output VA-API / VDPAU
+    o Audio FFMpeg / Alsa / Analog
+    o Audio FFMpeg / Alsa / Digital
+    o Audio FFMpeg / OSS / Analog
+    o HDMI/SPDIF pass-through
+    o YaepgHD support
+    o Software deinterlacer Bob (VA-API only)
+    o Autocrop
+    o Grab image (VDPAU only)
+    o Suspend
+    o Letterbox, Stretch and Center cut-out video display modes
 
-    o planned: Video VA-API/Opengl
-    o planned: Video VDPAU/Opengl
-    o planned: Video CPU/Xv
-    o planned: Video CPU/Opengl
+    o planned: Video decoder VA-API Branch: vaapi-ext/staging
+    o planned: Video output XvBA / Opengl / Xv
+    o planned: VA-API grab image
     o planned: Improved Software Deinterlacer (yadif or/and ffmpeg filters)
-    o planned: Video XvBA/XvBA
+    o planned: software volume, software channel resample
     o planned: atmo light support
 
 To compile you must have the 'requires' installed.
diff --git a/Todo b/Todo
index dec3aae..7b700c2 100644
--- a/Todo
+++ b/Todo
@@ -19,28 +19,24 @@ GNU Affero General Public License for more details.
 $Id: $
 
 missing:
-    software deinterlace (yadif, ...)
-    software decoder with software deinterlace
+    more software deinterlace (yadif, ...)
+    more software decoder with software deinterlace
     suspend output / energie saver: stop and restart X11
     suspend plugin didn't restore full-screen (is this wanted?)
     Option deinterlace off / deinterlace force!
     ColorSpace aren't configurable with the gui.
-    Replay of old vdr 1.6 recordings.
     works for me: restart vdr not working, when started x11 was killed.
 
-crash:
-    AudioPlayHandlerThread -> pthread_cond_wait
-
 video:
     subtitle not cleared
     subtitle could be asyncron
-    reduce warnings after channel switch
     grab image with hardware and better scaling support
-    hard channel switch
     yaepghd changed position is lost on channel switch
     pause (live tv) has sometime problems with SAT1 HD Pro7 HD
     radio show black background
     radio no need to wait on video buffers
+    starting with radio and own X11 server, shows no video
+    some low-bandwidth tv channels have hiccups.
 
 vdpau:
     software decoder path not working
@@ -54,8 +50,8 @@ libva:
     [drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed... GPU hung
     [drm:i915_wait_request] *ERROR* i915_wait_request returns -11 ...
 
-libva: branch vaapi-ext
-    add support for vaapi-ext
+libva: branch vaapi-ext / staging
+    add support for vaapi-ext / staging
 
 libva-intel-driver:
     deinterlace only supported with vaapi-ext