Improved -h option