cleanup admins + misc fixes