Fix help message and improve comments.