fixed some small bugs uncovered with Igor7