Readd filter.
Add better debugging facilities.