Update TODO & comments