some tunning related to command line adaptations and error handling