using better ranges for globe
fixing merge errors