some QA&fixes