argument parsing fixes