more ivar mistakes fixed