working on filters
better counting and filtering
updated dependencies