diff --git a/TODO b/TODO
index 7d22d703b..795a1876b 100644
--- a/TODO
+++ b/TODO
@@ -1,52 +1,32 @@
-- do not process effects when playing frozen patterns
-- select number of channels in export-project-dialog
-- try to make vestige-plugin-dlls relative
-- do song-editor-tempo-connection to vst-plugin inside remoteVSTPlugin
-- add/remove-steps button in bb-editor for adding/removing according number of steps to/from all patterns of visible beat/baseline
-- replace rest of wizard by simple directory-selection-dialog for working-dir when running the first time
-- correctly load steps/dots from FLP-files
-- convert FL-Plucked!-parameters to Vibed-parameters
-- in flp-import-filter: merge play-list-items if possible
-- integrated sample-browser in context-menu of sample-track/-tco
-- make note able of journalling
-- before calling undoStep/redoStep from journallingObject, save journalling-state-context and disabled journalling, restore afterwards
-- intelligent journal-entry-merging
-- undo/redo-support in note/track etc.
-- save tco-settings in trackContentWidget::saveSettings() etc. instead of track::...
-- restore stacking-order of windows when loading project
-- bristol-bindings?
-- resample sample-track-tcos when using hq-mode
-- add support for panes-interface (like blender) (instead of MDI etc.)
+Version 0.4.x
+=============
+
+- save tco-settings in trackContentWidget::saveSettings() etc. instead of 
+  track::...
+- resample sample-track-tcos when exporting at different samplerate
 - message to user when importing unsupported MIDI-file (track-count = 0)
-- AMS/OMS-bindings
-- remove binary-embed-system (Qt4-resource-system?)
-- recording-functionality
-- do not hang when saving while loading VST-plugin (because then we call dispatcher while the load-process is still going on)
-- tempo-recogn. and sync of beat-samples
-- make color-scheme switchable: LMMS / user
+- piano roll: mouse cursor isn't updated correctly in selection mode
+  (from resizing note edit area)
+- when you add vestige, have it automatically pop the find VST plugin dialog
+- try to make vestige-plugin-dlls relative
+- select all MIDI devices by default when you bring up the "connect to controller"
+  window and wait for first event - then uncheck all other MIDI devices that no
+  events were detected from
+- load asdlol.mmpz. if you render it without playing it, or if you play it
+  the first time, you hear unwanted artifacts. (solution: apply automation
+  before playing)
 - autosave every 30s (configurable!) and offer recovery at startup after crash
-- make piano-roll use rubberband instead of implementing a simple one on it's own
-- level-meters in output-graph and instrument-track
-- MIDI-program/MIDI-mapping/process program-/channel-change-events from MIDI-files
-- DSSI-support
-- use drawLineF() for drawing notes in pattern::paintEvent() in qt4-version
-- only redraw region given by paint-event in pattern, bbTCO, sampleTCO etc.
-- pre-listen when opening sample with QFileDialog
-- panning-editing in piano-roll
 - speed up painting of sampleTCO
-- panning env+lfo
-- rewrite export-project-dialog using layout-mechanism
-- make piano-roll use the global clipboard??
-- add more localizations:
-	- Swedish
-	- Norwegian
-	- Greece
-	- ...
+- do not process effects when playing frozen patterns
+- copy-pasted automation patterns have to be manually linked back to
+  their knob for some reason
+- improve TrackLabelButton: split 80%-20% (80%=name, 20%=button showing a popup
+  menu with track operations, make the midi input a top-level menu item)
+- when you click and drag a mixer bar, it doesn't click and drag, it sets
+  absolutely. this is annoying
 
 
-- effect-board -> live-fx from input
-- chord-editor?
-- WAVE/OGG/MP3-Import -> FFT-analysis -> write notes
-- classical note-edit-window -> also ability of printing and maybe later scanning & recognition of notes
-- add FLAC as export-format?
+See TODO file in master branch and/or the TODO list in the Wiki for details
+regarding the development series.
+