variables enclosed in {}, proper fact scoping, remove quoting for variab...

...les only