improvements to what is content

@rodrigopavezi please review.