Handle multivalued parameters

+ Cosmetic fixes