more filters and fixed minor bugs