some code cleanup
assets changed (globes)
merge changes