fixed a couple of regressions. nw.