updated filter notes and other changes
Merge branch 'master' of https://github.com/wvdklee/dev