More tweaks, lighting bug persists