arg number fix & A little cleanup