Modified Makefile and Grammar/builder.sh