fix some dismatches and problems