Fixed segfault in light

+ Minor tweaks and fixes