More changes, some bug fixes

Trying to deal with filter problems