Model filtering and other small refinements.