Fixed useless TODO's and added other files.