update to makefile and setup scripts