global lights fix & clean up