lots of globe fixes and cleanup