fixed the model layer to be something approaching sane.