minor changes to setup.sh to allow transition to naf2