New ToDo, small fixes.