Answers and evaluation fix