made several changes related to distinguishing between global scope and frameform scope