small changes

these changes are just to minimize the # of differencea between our
code and previously submitted code