move admin methods to separate file; squash bugs