Minor smoothing and additions