Somewhat fixed handling of constraints--at least they are basically working even if there are still algorithmic issues overall.  This also helped fixing linear fitting of model sets of 2D models.