Make answer checker more robust and fix wording