- a few minor changes to Global variable placements