Updated some TODO's