comments - address more of roc's review comments DONTBUILD