Some changes based on QA