Fixup on description and some option descrips
Land #2971 - Fixup on description and some option descrips