some admin enhancements