updated makefiles and setup scripts