update TODO, update makefile cleanup