improved cmd args