added handling for commas in options; updated functions list