Optimize
Allow use of options with marks (ex: cd -P mark)
Correct return statuses