remove some FIXMEs and add explicit crit = ei to control object of constant liar test