Fixed lighting and saving