Fix Bugs and Modify Correct/Incorrect Responses Metrics