fixes in the typesystem and in constraints
Merge remote-tracking branch 'origin/master'