Minor model improvements
Small printing changes