Updated TODO comments, examples