fixing parameter parsing; fixing if string location contains comma