Updated makefile and TODO doc