fixed issues noted in QA