Add comments and sane settings for new options