Updated the Makefile and the todo list.