many improvements to admin