Updated todo and makefile