fixing some parsing in argument list