fixed global namespacing of global vars