correct parsing of functions
fine-tune parsing of cli arguments