Fixed some TODOs, some are left