Many small things. 
Bug fix for null in ModelSets.