Finished adding filters, bug fixing etc