Final improvements to make file and applied changes to lex/bison source files.