fixes admin bugs and small admin refactors