Improved question generation