Another change in the API for filtering - updating documentation. Also some minor name, comments and format tidying.

Still not yet implemented. Be patient.