A few more additions to TODO