add blocks, smarter filters and some other stuff