more filters, a little bit of cleanup