Reworked lighting code and models