Numerous tweaks responding to model problems.