adds more admin stuff, some refactoring