Some small bugs in my new model. For #52.