Add comment section and little adjustment.