fixes suggested by mike