fixes suggested by Kelley