Cleaning up code
Updated the fwfilter tests and documentation