Implemented many more filters; some code cleanup