adding some more people filters and some cleanup