Updated some TODO