Work on --command improvements