updates to match top of tree, grpquota support, fix output to match 3.01