Updated filter, added some docs