Updated TODO: checklist, more points