Fixed some bugs with Todo