some changes in parsing argv