Added a few more parameter sets and fixed one type