WIP update config and Makefile newer ver w/ cgraph