Revert admin classes
Fix BC break in base

Also, more comment tweaks.