Improved lighting

- Some minor fixes and changes