fixes a bug and updates todo list.