QA Follow up and notes