rename of locN & argN variables and other fix