Further improvements and fixes in surface shading.