evals added, makefile made