Some work on parameter classes, a bugfix on the splitting algorithm
some simplifications in the generation stage