add more robust command line handling