Improve lighting and height calibration
Merge branch 'lighting-improvements'