mainly small cosmetic fixes