fixed setup routines & makefile for recent changes