Better command line output and adjustments