added some missing pieces about heandling desiderata