Fixes and accept even greater range of factored answers