Fixed Lighting and some simplifications