Added TidyFilter. Fixed some related errors.