Some improvements to handling questions from users