update todo
cleaner makefile... marginally