makefile and design update