Changes in the TODO. More improvements