more preening of the models and views