Update some TODOs

Created by  Fabian Neumann  on February 2, 2018
Z474DASOAUJRI2MM454FMIJTEZOXEBUZ5JR7QFZ6ZK6G7VQ35MJQC
Change contents