Lighting fixes and tidy up.