Adding comma to several parameter regexes, for those that allow multiple. Other minor regex fixes