Fixed the comma separated list stuff