REVIEW_ANSWERS some more fixes. review_answers are everywhere :(