Bugfixes and light color tweaks