minor changes
refactoring
refactoring
filter more
-refactor
fixes+test

-sweep still buggy