cosmetic fixes by broff