Some changes following WP review.