cleaned up stuff, refactoring admin