Adds basic filters
Fixes some bugs