Added more filters, improved documentation