implemented better question handling