Update todo list

(and test branches)