Update to 1.2 added rest of custom filter objects and cleaned up some code

Update to 1.2 added rest of custom filter objects and cleaned up some
code