better cosmetic fixes