added filters, removed debug output