Updated comments/TODOS