improve command line options parsing, and changes several things in order to evaluate on QALD4