Update and improve comments.