minor fixes suggested by evan