more admin improvements