Adjusted Makefile, and Branch and Node Terms Fixed