adjusts scope/symbol look up, WIP #7