Minor makefile and todo updates
 -Erik
2 files changed