optimized and bugfixed cli parameter evaluation.