some fixes on light but still bad