Move questions to constant
Typo fix
Extend list of questions"