model changes and other bits and pieces