models: updated all models to properly use scalarsets and the new set of constraints
paper: various additions