cleanup and lighting fixes