added checks to parameter choices