Adjusted todo's concerning DE&WM choice.