multiple cosmetic fixes