added some more filters, added some more comments