updated commandline parser