Filters fixed and other things here and tehtre