More filter work, and doc updates