makefile, fabfile updates