admin cleanups, tweaks