Added more filters and did some more fluid work.
Merge remote-tracking branch 'origin/master'