make it obvious that -h will show help
fix deprecation warnings