several fixes suggested by the list