bug fixes, & some refined model interactions