Minor udpates to Setup and Makefile