some improvements to cells and model-rules