Fix and expand comments.