Updated TODO and Makefile