updated todo, as some things are not relevant for thsi branch...