minor changes to scoping.  Updates to QFCS model