Enhanced light env and major fixes