consistency updates
working toward filtering functionality
a lot of changes  including new filtering features!