minor update to argument handling