Improve --help handling and output