Improved command line behaviour a LOT.