fixed comma problem and string sanity