v0.006 changes to filter_ws 

Cosmetic changes and other minor fixes.