Command line behaviour improved.