Some tweaks to the models which close #348