Last changes to update help and do some style changes.

Change-Id: I09ff302831b205e6424dd6daa4c9832cd156c944