General BUG cleanup to decrease time to save globals: (#212)