add and close some todos

Signed-off-by: Moritz Ulrich <ulrich.moritz@googlemail.com>