Fix lighting, cleanup