merge conflicts
brighter light, fix physically impossible sphere