Clean up

Assorted clean up bits and bobs
Feature

Ability to filter import users