Add ? to all uppercase var refs, and replaced set -x