several TODOs and minor modification to Makefile