first pass of cosmetic updates