cosmetics, small fixes