Lighting and other minor fixed