Refactor routes; fixed marking answers.