mostly cosmetic fixes