New command line options and fixed recursion on depth