Updates for lights prebuild and little changes