big fixes to what-if