re-assign some tasks in TODO to Stefan