Cleaned up comments and changed filter params