added TODO and modified Makefile