Fix various privacy violations uncovered
Update various imports that were leaks of globs
wip
wip
wip again