Filter insanity

Fixes #137 and addresses part of #139 (needs README update)