commandline parsing improved