TODOs cleanup + small fixes