Add the -e flag to change command evaluator
tweak command line flags parsing