misc admin improvements