renamed stuff + improved light management