fixed some bugs for todo. maybe still null todo values