Further attempting to improve Light

Also fixing glitches!