Merge & some admin improvements