More admin.py improvements

I just found this unmerged branch that resolves some open issues.