light is respected now. Also some minor cleanup