numerous admin enhancements
merge