Added filters and loads of other tweaks