Updated model and settings.

Model seems to be working for both Labs and unchanged settings.  More
investigation needed, but looking good.