More TODOs and problems

it happens