fixed things keithp noticed in initial review