Light bug fix + general improvements