Updated TODO's with references to github issues