Improved the short and long options.

Fix bug, typo in option stop