source and makefile changes