added TODO: tasks and removed old comments