update model. minor fixes.