remove points where our fit fails from the best expected (this is just a hack to keep the exclusion from changing from the previous version)
add flags to check for unset