Updated todo notes, moved todo from screen to DEMO.cwiki with others