Fix up some issues, make Light