model corrections, minor fixes