Makefile and diffraction update