Improve option parse
Improve usage of "--deep" option