add TODO and Makefile
several TODOs and minor modification to Makefile