README, TODO, Makefile update