removed some globals
more global removals
almost forgot to add a file