some fixes.  model still does not go through.