tweaking lighting code
merging