Massive update

Note that this added a revised filter.py Replace your old one!