fixes admin and refactors