Improvements and code for Q&A scenario