support for value and cardinality constraints in restriction classes (and bug fixes)