Updated todo list and makefile