makefile and code changes 20th May.