Added filters
Fixed a few specs