Fixes faulty answer checking logic, next step: cleanup